From 95ee20f0b79d351641dab6579aed9069d077a8ee Mon Sep 17 00:00:00 2001 From: p1c2u Date: Wed, 29 Dec 2021 05:23:16 +0000 Subject: [PATCH] Remove six --- openapi_schema_validator/_format.py | 21 ++++++++++----------- openapi_schema_validator/_types.py | 3 +-- poetry.lock | 2 +- pyproject.toml | 1 - tests/integration/test_validators.py | 17 ++++++++--------- 5 files changed, 20 insertions(+), 24 deletions(-) diff --git a/openapi_schema_validator/_format.py b/openapi_schema_validator/_format.py index 0fb9e97..2d96a91 100644 --- a/openapi_schema_validator/_format.py +++ b/openapi_schema_validator/_format.py @@ -5,7 +5,6 @@ from jsonschema._format import FormatChecker from jsonschema.exceptions import FormatError -from six import binary_type, text_type, integer_types DATETIME_HAS_RFC3339_VALIDATOR = False DATETIME_HAS_STRICT_RFC3339 = False @@ -38,11 +37,11 @@ def is_int32(instance): - return isinstance(instance, integer_types) + return isinstance(instance, int) def is_int64(instance): - return isinstance(instance, integer_types) + return isinstance(instance, int) def is_float(instance): @@ -56,11 +55,11 @@ def is_double(instance): def is_binary(instance): - return isinstance(instance, binary_type) + return isinstance(instance, bytes) def is_byte(instance): - if isinstance(instance, text_type): + if isinstance(instance, str): instance = instance.encode() try: @@ -70,7 +69,7 @@ def is_byte(instance): def is_datetime(instance): - if not isinstance(instance, (binary_type, text_type)): + if not isinstance(instance, (bytes, str)): return False if DATETIME_HAS_RFC3339_VALIDATOR: @@ -86,23 +85,23 @@ def is_datetime(instance): def is_date(instance): - if not isinstance(instance, (binary_type, text_type)): + if not isinstance(instance, (bytes, str)): return False - if isinstance(instance, binary_type): + if isinstance(instance, bytes): instance = instance.decode() return datetime.strptime(instance, "%Y-%m-%d") def is_uuid(instance): - if not isinstance(instance, (binary_type, text_type)): + if not isinstance(instance, (bytes, str)): return False - if isinstance(instance, binary_type): + if isinstance(instance, bytes): instance = instance.decode() - return text_type(UUID(instance)).lower() == instance.lower() + return str(UUID(instance)).lower() == instance.lower() def is_password(instance): diff --git a/openapi_schema_validator/_types.py b/openapi_schema_validator/_types.py index b647dfc..c18b62d 100644 --- a/openapi_schema_validator/_types.py +++ b/openapi_schema_validator/_types.py @@ -2,11 +2,10 @@ TypeChecker, is_array, is_bool, is_integer, is_object, is_number, ) -from six import text_type, binary_type def is_string(checker, instance): - return isinstance(instance, (text_type, binary_type)) + return isinstance(instance, (str, bytes)) oas30_type_checker = TypeChecker( diff --git a/poetry.lock b/poetry.lock index f88d797..fc2c05c 100644 --- a/poetry.lock +++ b/poetry.lock @@ -529,7 +529,7 @@ strict-rfc3339 = ["strict-rfc3339"] [metadata] lock-version = "1.1" python-versions = "^3.6.2" -content-hash = "f4598afd9878f06a720249b59518c5d390036237b45694f8566e7b9c75adbe6f" +content-hash = "7729739041f5306ea7356f29d70dd0b22571fd38fc57f07936a41b124bc26b12" [metadata.files] atomicwrites = [ diff --git a/pyproject.toml b/pyproject.toml index ab5b39c..9450d4c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,7 +33,6 @@ classifiers = [ [tool.poetry.dependencies] python = "^3.6.2" -six = "*" jsonschema = "*" rfc3339-validator = {version = "*", optional = true} strict-rfc3339 = {version = "*", optional = true} diff --git a/tests/integration/test_validators.py b/tests/integration/test_validators.py index de3b5ab..9b5e458 100644 --- a/tests/integration/test_validators.py +++ b/tests/integration/test_validators.py @@ -1,6 +1,5 @@ from jsonschema import ValidationError import pytest -from six import u from openapi_schema_validator import OAS30Validator, oas30_format_checker @@ -36,8 +35,8 @@ def test_nullable(self, schema_type): assert result is None @pytest.mark.parametrize('value', [ - u('1989-01-02T00:00:00Z'), - u('2018-01-02T23:59:59Z'), + u'1989-01-02T00:00:00Z', + u'2018-01-02T23:59:59Z', ]) @mock.patch( 'openapi_schema_validator._format.' @@ -61,8 +60,8 @@ def test_string_format_no_datetime_validator(self, value): assert result is None @pytest.mark.parametrize('value', [ - u('1989-01-02T00:00:00Z'), - u('2018-01-02T23:59:59Z'), + u'1989-01-02T00:00:00Z', + u'2018-01-02T23:59:59Z', ]) @mock.patch( 'openapi_schema_validator._format.' @@ -86,8 +85,8 @@ def test_string_format_datetime_rfc3339_validator(self, value): assert result is None @pytest.mark.parametrize('value', [ - u('1989-01-02T00:00:00Z'), - u('2018-01-02T23:59:59Z'), + u'1989-01-02T00:00:00Z', + u'2018-01-02T23:59:59Z', ]) @mock.patch( 'openapi_schema_validator._format.' @@ -111,8 +110,8 @@ def test_string_format_datetime_strict_rfc3339(self, value): assert result is None @pytest.mark.parametrize('value', [ - u('1989-01-02T00:00:00Z'), - u('2018-01-02T23:59:59Z'), + u'1989-01-02T00:00:00Z', + u'2018-01-02T23:59:59Z', ]) @mock.patch( 'openapi_schema_validator._format.'