Merge remote-tracking branch 'upstream/master'

Deepwalker · Jun 20, 2017 · b38366d · b38366d
2 parents 3121992 + e8ab91a
commit b38366d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 17 deletions.
diff --git a/tests/test_base.py b/tests/test_base.py
@@ -729,16 +729,6 @@ def test_nested_dataerror_value(self):
             {0: "Wait for good value, got 'BAD ONE'"}
         )
 
-    def test_dataerror_as_boolean(self):
-        error = t.DataError('error')
-        self.assertEqual(bool(error), False)
-        self.assertEqual(error or 2, 2)
-
-    def test_dataerror_and_catch(self):
-        trafaret = t.Int()
-        val = t.catch(trafaret, 'a') or 100
-        self.assertEqual(val, 100)
-
 
 # res = @guard(a=String, b=Int, c=String)
 #     def fn(a, b, c="default"):

diff --git a/trafaret/__init__.py b/trafaret/__init__.py
@@ -12,7 +12,7 @@
 from .lib import py3, py3metafix
 
 
-__VERSION__ = (0, 10, 0)
+__VERSION__ = (0, 10, 2)
 
 
 # Python3 support
@@ -76,12 +76,6 @@ def __str__(self):
     def __repr__(self):
         return 'DataError(%s)' % str(self)
 
-    def __bool__(self):
-        return False
-
-    def __nonzero__(self):
-        return False
-
     def as_dict(self, value=False):
         def as_dict(dataerror):
             if not isinstance(dataerror.error, dict):