Get rid of python2 support

pyproject.toml

@@ -14,12 +14,11 @@ repository = "https://github.com/1Password/connect-sdk-python"
 [tool.poetry.dependencies]
 python = "^3.7"
 requests = "^2.24.0"
-six = "^1.10"
 python-dateutil = "^2.8.1"
 
 [tool.poetry.dev-dependencies]
-pytest = "^6.0"
-pytest-cov = "^3.0.0"
+pytest = "^7.2.0"
+pytest-cov = "^4.0.0"
 
 [build-system]
 requires = ["poetry>=0.12"]

src/onepasswordconnectsdk/client.py

@@ -3,7 +3,6 @@
 import json
 import os
 import re
-import six
 import requests
 import datetime
 from requests.exceptions import HTTPError
@@ -16,10 +15,9 @@
 
 
 class Client:
-    PRIMITIVE_TYPES = (float, bool, bytes, six.text_type) + six.integer_types
+    PRIMITIVE_TYPES = (float, bool, bytes, str, int)
     NATIVE_TYPES_MAPPING = {
         "int": int,
-        "long": int if six.PY3 else long,  # type: ignore # noqa: F821
         "float": float,
         "str": str,
         "bool": bool,
@@ -443,13 +441,13 @@ def sanitize_for_serialization(self, obj):
             # model definition for request.
             obj_dict = {
                 obj.attribute_map[attr]: getattr(obj, attr)
-                for attr, _ in six.iteritems(obj.openapi_types)
+                for attr in obj.openapi_types.keys()
                 if getattr(obj, attr) is not None
             }
 
         return {
             key: self.sanitize_for_serialization(val)
-            for key, val in six.iteritems(obj_dict)
+            for key, val in obj_dict.items()
         }
 
     def __deserialize(self, data, klass):
@@ -471,7 +469,7 @@ def __deserialize(self, data, klass):
             if klass.startswith("dict("):
                 sub_kls = re.match(r"dict\(([^,]*), (.*)\)", klass).group(2)
                 return {
-                    k: self.__deserialize(v, sub_kls) for k, v in six.iteritems(data)  # noqa: E501
+                    k: self.__deserialize(v, sub_kls) for k, v in data.items()  # noqa: E501
                 }
 
             # convert str to class
@@ -502,7 +500,7 @@ def __deserialize_primitive(self, data, klass):
         try:
             return klass(data)
         except UnicodeEncodeError:
-            return six.text_type(data)
+            return str(data)
         except TypeError:
             return data
 
@@ -570,7 +568,7 @@ def __deserialize_model(self, data, klass):
                 and klass.openapi_types is not None
                 and isinstance(data, (list, dict))
         ):
-            for attr, attr_type in six.iteritems(klass.openapi_types):
+            for attr, attr_type in klass.openapi_types.items():
                 if klass.attribute_map[attr] in data:
                     value = data[klass.attribute_map[attr]]
                     kwargs[attr] = self.__deserialize(value, attr_type)

src/onepasswordconnectsdk/models/error.py

@@ -13,8 +13,6 @@
 import pprint
 import re  # noqa: F401
 
-import six
-
 
 class Error(object):
     """NOTE: This class is auto generated by OpenAPI Generator.
@@ -94,7 +92,7 @@ def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
 
-        for attr, _ in six.iteritems(self.openapi_types):
+        for attr in self.openapi_types.keys():
             value = getattr(self, attr)
             if isinstance(value, list):
                 result[attr] = list(

src/onepasswordconnectsdk/models/field.py

@@ -13,8 +13,6 @@
 import pprint
 import re  # noqa: F401
 
-import six
-
 
 class Field(object):
     """NOTE: This class is auto generated by OpenAPI Generator.
@@ -290,7 +288,7 @@ def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
 
-        for attr, _ in six.iteritems(self.openapi_types):
+        for attr in self.openapi_types.keys():
             value = getattr(self, attr)
             if isinstance(value, list):
                 result[attr] = list(map(

src/onepasswordconnectsdk/models/field_section.py

@@ -13,8 +13,6 @@
 import pprint
 import re  # noqa: F401
 
-import six
-
 
 class FieldSection(object):
     """NOTE: This class is auto generated by OpenAPI Generator.
@@ -70,7 +68,7 @@ def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
 
-        for attr, _ in six.iteritems(self.openapi_types):
+        for attr in self.openapi_types.keys():
             value = getattr(self, attr)
             if isinstance(value, list):
                 result[attr] = list(map(

src/onepasswordconnectsdk/models/file.py

@@ -1,8 +1,6 @@
 import pprint
 import re  # noqa: F401
 
-import six
-
 
 class File(object):
     openapi_types = {
@@ -71,7 +69,7 @@ def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
 
-        for attr, _ in six.iteritems(self.openapi_types):
+        for attr in self.openapi_types.keys():
             value = getattr(self, attr)
             if isinstance(value, list):
                 result[attr] = list(map(

src/onepasswordconnectsdk/models/item.py

@@ -13,8 +13,6 @@
 import pprint
 import re  # noqa: F401
 
-import six
-
 
 class Item(object):
     """NOTE: This class is auto generated by OpenAPI Generator.
@@ -406,7 +404,7 @@ def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
 
-        for attr, _ in six.iteritems(self.openapi_types):
+        for attr in self.openapi_types.keys():
             value = getattr(self, attr)
             if isinstance(value, list):
                 result[attr] = list(map(

src/onepasswordconnectsdk/models/item_details.py

@@ -13,8 +13,6 @@
 import pprint
 import re  # noqa: F401
 
-import six
-
 
 class ItemDetails(object):
     """NOTE: This class is auto generated by OpenAPI Generator.
@@ -96,7 +94,7 @@ def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
 
-        for attr, _ in six.iteritems(self.openapi_types):
+        for attr in self.openapi_types.keys():
             value = getattr(self, attr)
             if isinstance(value, list):
                 result[attr] = list(map(

src/onepasswordconnectsdk/models/item_urls.py

@@ -13,8 +13,6 @@
 import pprint
 import re  # noqa: F401
 
-import six
-
 
 class ItemUrls(object):
     """NOTE: This class is auto generated by OpenAPI Generator.
@@ -96,7 +94,7 @@ def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
 
-        for attr, _ in six.iteritems(self.openapi_types):
+        for attr in self.openapi_types.keys():
             value = getattr(self, attr)
             if isinstance(value, list):
                 result[attr] = list(map(

src/onepasswordconnectsdk/models/item_vault.py

@@ -13,8 +13,6 @@
 import pprint
 import re  # noqa: F401
 
-import six
-
 
 class ItemVault(object):
     """NOTE: This class is auto generated by OpenAPI Generator.
@@ -70,7 +68,7 @@ def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
 
-        for attr, _ in six.iteritems(self.openapi_types):
+        for attr in self.openapi_types.keys():
             value = getattr(self, attr)
             if isinstance(value, list):
                 result[attr] = list(map(

src/onepasswordconnectsdk/models/section.py

@@ -13,8 +13,6 @@
 import pprint
 import re  # noqa: F401
 
-import six
-
 
 class Section(object):
     """NOTE: This class is auto generated by OpenAPI Generator.
@@ -95,7 +93,7 @@ def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
 
-        for attr, _ in six.iteritems(self.openapi_types):
+        for attr in self.openapi_types.keys():
             value = getattr(self, attr)
             if isinstance(value, list):
                 result[attr] = list(map(

src/onepasswordconnectsdk/models/summary_item.py

@@ -13,7 +13,6 @@
 import pprint
 import re  # noqa: F401
 
-import six
 
 from onepasswordconnectsdk.models import Item
 
@@ -356,7 +355,7 @@ def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
 
-        for attr, _ in six.iteritems(self.openapi_types):
+        for attr in self.openapi_types.keys():
             value = getattr(self, attr)
             if isinstance(value, list):
                 result[attr] = list(map(

src/onepasswordconnectsdk/models/vault.py

@@ -13,8 +13,6 @@
 import pprint
 import re  # noqa: F401
 
-import six
-
 
 class Vault(object):
     """NOTE: This class is auto generated by OpenAPI Generator.
@@ -291,7 +289,7 @@ def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
 
-        for attr, _ in six.iteritems(self.openapi_types):
+        for attr in self.openapi_types.keys():
             value = getattr(self, attr)
             if isinstance(value, list):
                 result[attr] = list(map(