chore(dependency): remove six library (#439)

Author: bednar

CHANGELOG.md

@@ -1,10 +1,13 @@
 ## 1.29.0 [unreleased]
 
+### Breaking Changes
+1. [#433](https://github.com/influxdata/influxdb-client-python/pull/433): Rename `InvocableScripts` to `InvokableScripts`
+
 ### Features
 1. [#435](https://github.com/influxdata/influxdb-client-python/pull/435): Add possibility to authenticate by `username/password`
 
-### Breaking Changes
-1. [#433](https://github.com/influxdata/influxdb-client-python/pull/433): Rename `InvocableScripts` to `InvokableScripts`
+### Dependencies
+1. [#439](https://github.com/influxdata/influxdb-client-python/pull/439): Remove `six` library
 
 ### Documentation
 1. [#434](https://github.com/influxdata/influxdb-client-python/pull/434): How the client uses [logging](https://docs.python.org/3/library/logging.html)

influxdb_client/_async/api_client.py

@@ -13,20 +13,17 @@
 import datetime
 import json
 import mimetypes
-from multiprocessing.pool import ThreadPool
 import os
 import re
 import tempfile
+from multiprocessing.pool import ThreadPool
+from urllib.parse import quote
 
-# python 2 and python 3 compatibility library
-import six
-from six.moves.urllib.parse import quote
-
-from influxdb_client.configuration import Configuration
 import influxdb_client.domain
-from influxdb_client._async import rest
 from influxdb_client import SigninService
 from influxdb_client import SignoutService
+from influxdb_client._async import rest
+from influxdb_client.configuration import Configuration
 from influxdb_client.rest import _requires_create_user_session, _requires_expire_user_session
 
 
@@ -52,10 +49,10 @@ class ApiClientAsync(object):
         to the API. More threads means more concurrent API requests.
     """
 
-    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,  # noqa: F821
+        'long': int,
         'float': float,
         'str': str,
         'bool': bool,
@@ -231,11 +228,11 @@ def sanitize_for_serialization(self, obj):
             # Convert attribute name to json key in
             # 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.items()
                         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, response, response_type):
         """Deserializes response into an object.
@@ -279,7 +276,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)}
+                        for k, v in data.items()}
 
             # convert str to class
             if klass in self.NATIVE_TYPES_MAPPING:
@@ -438,7 +435,7 @@ def parameters_to_tuples(self, params, collection_formats):
         new_params = []
         if collection_formats is None:
             collection_formats = {}
-        for k, v in six.iteritems(params) if isinstance(params, dict) else params:  # noqa: E501
+        for k, v in params.items() if isinstance(params, dict) else params:  # noqa: E501
             if k in collection_formats:
                 collection_format = collection_formats[k]
                 if collection_format == 'multi':
@@ -471,7 +468,7 @@ def prepare_post_parameters(self, post_params=None, files=None):
             params = post_params
 
         if files:
-            for k, v in six.iteritems(files):
+            for k, v in files.items():
                 if not v:
                     continue
                 file_names = v if type(v) is list else [v]
@@ -577,7 +574,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
 
@@ -640,7 +637,7 @@ def __deserialize_model(self, data, klass):
 
         kwargs = {}
         if klass.openapi_types is not None:
-            for attr, attr_type in six.iteritems(klass.openapi_types):
+            for attr, attr_type in klass.openapi_types.items():
                 if (data is not None and
                         klass.attribute_map[attr] in data and
                         isinstance(data, (list, dict))):

influxdb_client/_async/rest.py

@@ -12,11 +12,9 @@
 import json
 import re
 import ssl
+from urllib.parse import urlencode
 
 import aiohttp
-# python 2 and python 3 compatibility library
-import six
-from six.moves.urllib.parse import urlencode
 
 from influxdb_client.rest import ApiException
 from influxdb_client.rest import _UTF_8_encoding
@@ -111,7 +109,7 @@ def __init__(self, configuration, pools_size=4, maxsize=None, **kwargs):
         trace_config.on_request_end.append(_on_request_end)
 
         # timeout
-        if isinstance(configuration.timeout, (int, float,) if six.PY3 else (int, long, float,)):  # noqa: E501,F821
+        if isinstance(configuration.timeout, (int, float,)):  # noqa: E501,F821
             timeout = aiohttp.ClientTimeout(total=configuration.timeout / 1_000)
         elif isinstance(configuration.timeout, aiohttp.ClientTimeout):
             timeout = configuration.timeout

influxdb_client/_sync/api_client.py

@@ -13,20 +13,17 @@
 import datetime
 import json
 import mimetypes
-from multiprocessing.pool import ThreadPool
 import os
 import re
 import tempfile
+from multiprocessing.pool import ThreadPool
+from urllib.parse import quote
 
-# python 2 and python 3 compatibility library
-import six
-from six.moves.urllib.parse import quote
-
-from influxdb_client.configuration import Configuration
 import influxdb_client.domain
-from influxdb_client._sync import rest
 from influxdb_client import SigninService
 from influxdb_client import SignoutService
+from influxdb_client._sync import rest
+from influxdb_client.configuration import Configuration
 from influxdb_client.rest import _requires_create_user_session, _requires_expire_user_session
 
 
@@ -52,10 +49,10 @@ class ApiClient(object):
         to the API. More threads means more concurrent API requests.
     """
 
-    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,  # noqa: F821
+        'long': int,
         'float': float,
         'str': str,
         'bool': bool,
@@ -231,11 +228,11 @@ def sanitize_for_serialization(self, obj):
             # Convert attribute name to json key in
             # 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.items()
                         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, response, response_type):
         """Deserializes response into an object.
@@ -279,7 +276,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)}
+                        for k, v in data.items()}
 
             # convert str to class
             if klass in self.NATIVE_TYPES_MAPPING:
@@ -438,7 +435,7 @@ def parameters_to_tuples(self, params, collection_formats):
         new_params = []
         if collection_formats is None:
             collection_formats = {}
-        for k, v in six.iteritems(params) if isinstance(params, dict) else params:  # noqa: E501
+        for k, v in params.items() if isinstance(params, dict) else params:  # noqa: E501
             if k in collection_formats:
                 collection_format = collection_formats[k]
                 if collection_format == 'multi':
@@ -471,7 +468,7 @@ def prepare_post_parameters(self, post_params=None, files=None):
             params = post_params
 
         if files:
-            for k, v in six.iteritems(files):
+            for k, v in files.items():
                 if not v:
                     continue
                 file_names = v if type(v) is list else [v]
@@ -577,7 +574,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
 
@@ -640,7 +637,7 @@ def __deserialize_model(self, data, klass):
 
         kwargs = {}
         if klass.openapi_types is not None:
-            for attr, attr_type in six.iteritems(klass.openapi_types):
+            for attr, attr_type in klass.openapi_types.items():
                 if (data is not None and
                         klass.attribute_map[attr] in data and
                         isinstance(data, (list, dict))):

influxdb_client/_sync/rest.py

@@ -16,10 +16,7 @@
 import json
 import re
 import ssl
-
-# python 2 and python 3 compatibility library
-import six
-from six.moves.urllib.parse import urlencode
+from urllib.parse import urlencode
 
 from influxdb_client.rest import ApiException
 
@@ -157,7 +154,7 @@ def request(self, method, url, query_params=None, headers=None,
         timeout = None
         _configured_timeout = _request_timeout or self.configuration.timeout
         if _configured_timeout:
-            if isinstance(_configured_timeout, (int, float, ) if six.PY3 else (int, long, float, )):  # noqa: E501,F821
+            if isinstance(_configured_timeout, (int, float, )):  # noqa: E501,F821
                 timeout = urllib3.Timeout(total=_configured_timeout / 1_000)
             elif (isinstance(_configured_timeout, tuple) and
                   len(_configured_timeout) == 2):
@@ -240,8 +237,7 @@ def request(self, method, url, query_params=None, headers=None,
 
             # In the python 3, the response.data is bytes.
             # we need to decode it to string.
-            if six.PY3:
-                r.data = r.data.decode('utf8')
+            r.data = r.data.decode('utf8')
 
         if not 200 <= r.status <= 299:
             raise ApiException(http_resp=r)

influxdb_client/client/write/point.py

@@ -7,7 +7,6 @@
 from numbers import Integral
 
 from pytz import UTC
-from six import iteritems
 
 from influxdb_client.client.util.date_utils import get_date_helper
 from influxdb_client.domain.write_precision import WritePrecision
@@ -50,7 +49,7 @@ class Point(object):
     """
     Point defines the values that will be written to the database.
 
-    Ref: http://bit.ly/influxdata-point
+    Ref: https://docs.influxdata.com/influxdb/latest/reference/key-concepts/data-elements/#point
     """
 
     @staticmethod
@@ -209,7 +208,7 @@ def __str__(self):
 
 def _append_tags(tags):
     _return = []
-    for tag_key, tag_value in sorted(iteritems(tags)):
+    for tag_key, tag_value in sorted(tags.items()):
 
         if tag_value is None:
             continue
@@ -225,7 +224,7 @@ def _append_tags(tags):
 def _append_fields(fields):
     _return = []
 
-    for field, value in sorted(iteritems(fields)):
+    for field, value in sorted(fields.items()):
         if value is None:
             continue
 

influxdb_client/configuration.py

@@ -13,13 +13,12 @@
 from __future__ import absolute_import
 
 import copy
+import http.client as httplib
 import logging
 import multiprocessing
 import sys
-import urllib3
 
-import six
-from six.moves import http_client as httplib
+import urllib3
 
 
 class TypeWithDefault(type):
@@ -45,7 +44,7 @@ def set_default(cls, default):
         cls._default = copy.copy(default)
 
 
-class Configuration(six.with_metaclass(TypeWithDefault, object)):
+class Configuration(object, metaclass=TypeWithDefault):
     """NOTE: This class is auto generated by OpenAPI Generator.
 
     Ref: https://openapi-generator.tech
@@ -143,7 +142,7 @@ def logger_file(self, value):
             # then add file handler and remove stream handler.
             self.logger_file_handler = logging.FileHandler(self.__logger_file)
             self.logger_file_handler.setFormatter(self.logger_formatter)
-            for _, logger in six.iteritems(self.loggers):
+            for _, logger in self.loggers.items():
                 logger.addHandler(self.logger_file_handler)
 
     @property
@@ -165,14 +164,14 @@ def debug(self, value):
         self.__debug = value
         if self.__debug:
             # if debug status is True, turn on debug logging
-            for _, logger in six.iteritems(self.loggers):
+            for _, logger in self.loggers.items():
                 logger.setLevel(logging.DEBUG)
             # turn on httplib debug
             httplib.HTTPConnection.debuglevel = 1
         else:
             # if debug status is False, turn off debug logging,
             # setting log level to default `logging.WARNING`
-            for _, logger in six.iteritems(self.loggers):
+            for _, logger in self.loggers.items():
                 logger.setLevel(logging.WARNING)
             # turn off httplib debug
             httplib.HTTPConnection.debuglevel = 0

influxdb_client/domain/add_resource_member_request_body.py

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

influxdb_client/domain/analyze_query_response.py

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