Expect str instances in tests

lyft · May 5, 2019 · 3c9d97d · 3c9d97d
1 parent 8878666
commit 3c9d97d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/tests/test_deserialization.py b/tests/test_deserialization.py
@@ -1832,7 +1832,7 @@ class RequireSchema(Schema):
     with pytest.raises(ValidationError) as excinfo:
         RequireSchema().load(user_data)
     errors = excinfo.value.messages
-    expected = [message] if isinstance(message, (bytes, str)) else message
+    expected = [message] if isinstance(message, str) else message
     assert expected == errors['age']
 
 

diff --git a/tests/test_serialization.py b/tests/test_serialization.py
@@ -196,11 +196,11 @@ def test_decimal_field_string(self, user):
         user.m6 = [1, 2]
 
         field = fields.Decimal(as_string=True)
-        assert isinstance(field.serialize('m1', user), (bytes, str))
+        assert isinstance(field.serialize('m1', user), str)
         assert field.serialize('m1', user) == '12'
-        assert isinstance(field.serialize('m2', user), (bytes, str))
+        assert isinstance(field.serialize('m2', user), str)
         assert field.serialize('m2', user) == '12.355'
-        assert isinstance(field.serialize('m3', user), (bytes, str))
+        assert isinstance(field.serialize('m3', user), str)
         assert field.serialize('m3', user) == '1'
         assert field.serialize('m4', user) is None
         with pytest.raises(ValidationError):
@@ -209,11 +209,11 @@ def test_decimal_field_string(self, user):
             field.serialize('m6', user)
 
         field = fields.Decimal(1, as_string=True)
-        assert isinstance(field.serialize('m1', user), (bytes, str))
+        assert isinstance(field.serialize('m1', user), str)
         assert field.serialize('m1', user) == '12.0'
-        assert isinstance(field.serialize('m2', user), (bytes, str))
+        assert isinstance(field.serialize('m2', user), str)
         assert field.serialize('m2', user) == '12.4'
-        assert isinstance(field.serialize('m3', user), (bytes, str))
+        assert isinstance(field.serialize('m3', user), str)
         assert field.serialize('m3', user) == '1.0'
         assert field.serialize('m4', user) is None
         with pytest.raises(ValidationError):
@@ -222,11 +222,11 @@ def test_decimal_field_string(self, user):
             field.serialize('m6', user)
 
         field = fields.Decimal(1, decimal.ROUND_DOWN, as_string=True)
-        assert isinstance(field.serialize('m1', user), (bytes, str))
+        assert isinstance(field.serialize('m1', user), str)
         assert field.serialize('m1', user) == '12.0'
-        assert isinstance(field.serialize('m2', user), (bytes, str))
+        assert isinstance(field.serialize('m2', user), str)
         assert field.serialize('m2', user) == '12.3'
-        assert isinstance(field.serialize('m3', user), (bytes, str))
+        assert isinstance(field.serialize('m3', user), str)
         assert field.serialize('m3', user) == '1.0'
         assert field.serialize('m4', user) is None
         with pytest.raises(ValidationError):
@@ -276,15 +276,15 @@ def test_decimal_field_special_values(self, user):
         field = fields.Decimal(as_string=True, allow_nan=True)
 
         m2s = field.serialize('m2', user)
-        assert isinstance(m2s, (bytes, str))
+        assert isinstance(m2s, str)
         assert m2s == user.m2
 
         m5s = field.serialize('m5', user)
-        assert isinstance(m5s, (bytes, str))
+        assert isinstance(m5s, str)
         assert m5s == user.m5
 
         m6s = field.serialize('m6', user)
-        assert isinstance(m6s, (bytes, str))
+        assert isinstance(m6s, str)
         assert m6s == user.m6
 
     def test_decimal_field_special_values_not_permitted(self, user):
@@ -355,12 +355,12 @@ def test_decimal_field_fixed_point_representation(self, user):
 
         field = fields.Decimal(as_string=True)
         s = field.serialize('m1', user)
-        assert isinstance(s, (bytes, str))
+        assert isinstance(s, str)
         assert s == user.m1
 
         field = fields.Decimal(as_string=True, places=2)
         s = field.serialize('m1', user)
-        assert isinstance(s, (bytes, str))
+        assert isinstance(s, str)
         assert s == '0.00'
 
     def test_boolean_field_serialization(self, user):