From 2afb80233ed034ebb841815ddb9704d65e193c6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20H=C3=B6nig?= <jan.hoenig@fau.de>
Date: Thu, 5 Apr 2018 11:14:35 +0200
Subject: [PATCH] pystencils_tests now works with pytest, not unittest

---
 astnodes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/astnodes.py b/astnodes.py
index bbc12505e..67fa8910c 100644
--- a/astnodes.py
+++ b/astnodes.py
@@ -60,7 +60,7 @@ class Conditional(Node):
         false_block: optional block which is run if conditional is false
     """
 
-    def __init__(self, condition_expr: sp.Expr, true_block: 'Block', false_block: Optional['Block'] = None) -> None:
+    def __init__(self, condition_expr: sp.Basic, true_block: Union['Block', 'SympyAssignment'], false_block: Optional['Block'] = None) -> None:
         super(Conditional, self).__init__(parent=None)
 
         assert condition_expr.is_Boolean or condition_expr.is_Relational
-- 
GitLab