all tests are passing

AlexandruBurlacu · Oct 17, 2018 · 0733750 · 0733750
1 parent 03d5c3b
commit 0733750
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/examples/class_inheritance_usecase.py b/examples/class_inheritance_usecase.py
@@ -2,11 +2,14 @@
 
 from pycontracts import Contract
 
+def remove_fst(dictionary):
+    del dictionary["arg__0"]
+    return dictionary
 
 class TestClassBase(object):
 
     @Contract.pre_conditions({
-        "Both arguments should be positive": lambda args, kwargs: args[1] > 0 and args[2] > 0
+        "Both arguments should be positive": lambda args: args.arg__1 > 0 and args.arg__2 > 0
     })
     def query(self, arg1, arg2):
          return arg1 * arg2
@@ -24,7 +27,7 @@ class TestClassChild(TestClassBase):
         "Return argument should be 0": lambda ret: ret == 0
     })
     def query(self, arg1, arg2):
-         return arg1 * arg2 - super().query(arg1, arg2)
+         return arg1 * arg2 - super(TestClassChild, self).query(arg1, arg2)
 
 
 if __name__ == "__main__":

diff --git a/examples/class_methods_usecase.py b/examples/class_methods_usecase.py
@@ -6,7 +6,7 @@
 class TestClass(object):
 
     @Contract.pre_conditions({
-        "Both arguments should be positive": lambda args, kwargs: args[1] > 0 and args[2] > 0
+        "Both arguments should be positive": lambda args: args.arg__1 > 0 and args.arg__2 > 0
     })
     def query(self, arg1, arg2):
          return arg1 * arg2

diff --git a/examples/simple_usecase.py b/examples/simple_usecase.py
@@ -3,7 +3,7 @@
 from pycontracts import Contract
 
 @Contract.pre_conditions({
-    "First argument should be positive": lambda args, kwargs: args[0] > 0
+    "First argument should be positive": lambda args: args.arg__0 > 0
 })
 @Contract.post_conditions({
     "Return argument should be negative": lambda ret: ret < 0

diff --git a/pycontracts/arguments.py b/pycontracts/arguments.py
@@ -9,7 +9,6 @@ def __init__(self, *args, **kwargs):
         self.__unify_kwargs()
 
         self.all_args = deepcopy(self.__dict__)
-        print(self.all_args)
 
     def __unify_args(self):
         for idx, value in enumerate(self.__args):

diff --git a/tests/test_contracts_classes.py b/tests/test_contracts_classes.py
@@ -1,11 +1,15 @@
 import unittest
 from pycontracts import Contract, exceptions
 
+def remove_fst(dictionary):
+    del dictionary["arg__0"]
+    return dictionary
+
 class TestClassBase(object):
 
     @Contract.pre_conditions({
         "All arguments should be positive":
-            lambda args: all(map(lambda x: 1 if x > 0 else 0, list(args.all_args.values())))
+            lambda args: all(map(lambda x: 1 if x > 0 else 0, list(remove_fst(args.all_args).values())))
     })
     def query(self, arg1, arg2):
          return arg1 * arg2