String byte format fix

p1c2u · p1c2u · commit 408291c4dcac · 2019-03-07T21:55:27.000Z
diff --git a/openapi_core/schema/schemas/models.py b/openapi_core/schema/schemas/models.py
@@ -19,7 +19,7 @@
     UndefinedItemsSchema, InvalidCustomFormatSchemaValue, InvalidSchemaProperty,
 )
 from openapi_core.schema.schemas.util import (
-    forcebool, format_date, format_datetime,
+    forcebool, format_date, format_datetime, format_byte,
 )
 from openapi_core.schema.schemas.validators import (
     TypeValidator, AttributeValidator,
@@ -50,7 +50,7 @@ class Schema(object):
         SchemaFormat.DATETIME: Format(format_datetime, TypeValidator(datetime)),
         SchemaFormat.BINARY: Format(binary_type, TypeValidator(binary_type)),
         SchemaFormat.UUID: Format(UUID, TypeValidator(UUID)),
-        SchemaFormat.BYTE: Format(b64decode, TypeValidator(binary_type)),
+        SchemaFormat.BYTE: Format(format_byte, TypeValidator(text_type)),
     }
 
     TYPE_VALIDATOR_CALLABLE_GETTER = {
diff --git a/openapi_core/schema/schemas/util.py b/openapi_core/schema/schemas/util.py
@@ -1,8 +1,9 @@
 """OpenAPI core schemas util module"""
+from base64 import b64decode
 import datetime
 from distutils.util import strtobool
 from json import dumps
-from six import string_types
+from six import string_types, text_type
 import strict_rfc3339
 
 
@@ -24,3 +25,7 @@ def format_date(value):
 def format_datetime(value):
     timestamp = strict_rfc3339.rfc3339_to_timestamp(value)
     return datetime.datetime.utcfromtimestamp(timestamp)
+
+
+def format_byte(value, encoding='utf8'):
+    return text_type(b64decode(value), encoding)
diff --git a/tests/integration/test_petstore.py b/tests/integration/test_petstore.py
@@ -2,7 +2,7 @@
 import pytest
 from base64 import b64encode
 from uuid import UUID
-from six import iteritems
+from six import iteritems, text_type, binary_type
 
 from openapi_core.extensions.models.models import BaseModel
 from openapi_core.schema.media_types.exceptions import (
@@ -31,11 +31,13 @@
 
 class TestPetstore(object):
 
-    api_key = b'12345'
+    api_key = '12345'
 
     @property
     def api_key_encoded(self):
-        return b64encode(self.api_key)
+        api_key_bytes = binary_type(self.api_key, 'utf8')
+        api_key_bytes_enc = b64encode(api_key_bytes)
+        return text_type(api_key_bytes_enc, 'utf8')
 
     @pytest.fixture
     def spec_dict(self, factory):
diff --git a/tests/integration/test_validators.py b/tests/integration/test_validators.py
@@ -1,6 +1,7 @@
 from base64 import b64encode
 import json
 import pytest
+from six import text_type, binary_type
 
 from openapi_core.schema.media_types.exceptions import (
     InvalidContentType, InvalidMediaTypeValue,
@@ -23,11 +24,13 @@ class TestRequestValidator(object):
 
     host_url = 'http://petstore.swagger.io'
 
-    api_key = b'12345'
+    api_key = '12345'
 
     @property
     def api_key_encoded(self):
-        return b64encode(self.api_key)
+        api_key_bytes = binary_type(self.api_key, 'utf8')
+        api_key_bytes_enc = b64encode(api_key_bytes)
+        return text_type(api_key_bytes_enc, 'utf8')
 
     @pytest.fixture
     def spec_dict(self, factory):
diff --git a/tests/unit/schema/test_schemas.py b/tests/unit/schema/test_schemas.py
@@ -479,7 +479,7 @@ def test_string_format_binary(self, value):
         assert result == value
 
     @pytest.mark.parametrize('value', [
-        u('tsssst'), u('dGVzdA=='),
+        b('tsssst'), b('dGVzdA=='),
     ])
     def test_string_format_byte_invalid(self, value):
         schema = Schema('string', schema_format='byte')
@@ -488,7 +488,7 @@ def test_string_format_byte_invalid(self, value):
             schema.validate(value)
 
     @pytest.mark.parametrize('value', [
-        b('tsssst'), b('dGVzdA=='),
+        u('tsssst'), u('dGVzdA=='),
     ])
     def test_string_format_byte(self, value):
         schema = Schema('string', schema_format='byte')

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`UndefinedItemsSchema, InvalidCustomFormatSchemaValue, InvalidSchemaProperty,`
`20`	`20`	`)`
`21`	`21`	`from openapi_core.schema.schemas.util import (`
`22`		`- forcebool, format_date, format_datetime,`
	`22`	`+ forcebool, format_date, format_datetime, format_byte,`
`23`	`23`	`)`
`24`	`24`	`from openapi_core.schema.schemas.validators import (`
`25`	`25`	`TypeValidator, AttributeValidator,`
`@@ -50,7 +50,7 @@ class Schema(object):`
`50`	`50`	`SchemaFormat.DATETIME: Format(format_datetime, TypeValidator(datetime)),`
`51`	`51`	`SchemaFormat.BINARY: Format(binary_type, TypeValidator(binary_type)),`
`52`	`52`	`SchemaFormat.UUID: Format(UUID, TypeValidator(UUID)),`
`53`		`- SchemaFormat.BYTE: Format(b64decode, TypeValidator(binary_type)),`
	`53`	`+ SchemaFormat.BYTE: Format(format_byte, TypeValidator(text_type)),`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`TYPE_VALIDATOR_CALLABLE_GETTER = {`