Skip to content

Commit 562f4fc

Browse files
bednarbednar
authored
chore(dependency): remove six library (influxdata#439)
1 parent e46b810 commit 562f4fc

File tree

333 files changed

+508
-1045
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

333 files changed

+508
-1045
lines changed

‎CHANGELOG.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
## 1.29.0 [unreleased]
22

3+
### Breaking Changes
4+
1. [#433](https://github.com/influxdata/influxdb-client-python/pull/433): Rename `InvocableScripts` to `InvokableScripts`
5+
36
### Features
47
1. [#435](https://github.com/influxdata/influxdb-client-python/pull/435): Add possibility to authenticate by `username/password`
58

6-
### Breaking Changes
7-
1. [#433](https://github.com/influxdata/influxdb-client-python/pull/433): Rename `InvocableScripts` to `InvokableScripts`
9+
### Dependencies
10+
1. [#439](https://github.com/influxdata/influxdb-client-python/pull/439): Remove `six` library
811

912
### Documentation
1013
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

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,17 @@
1313
import datetime
1414
import json
1515
import mimetypes
16-
from multiprocessing.pool import ThreadPool
1716
import os
1817
import re
1918
import tempfile
19+
from multiprocessing.pool import ThreadPool
20+
from urllib.parse import quote
2021

21-
# python 2 and python 3 compatibility library
22-
import six
23-
from six.moves.urllib.parse import quote
24-
25-
from influxdb_client.configuration import Configuration
2622
import influxdb_client.domain
27-
from influxdb_client._async import rest
2823
from influxdb_client import SigninService
2924
from influxdb_client import SignoutService
25+
from influxdb_client._async import rest
26+
from influxdb_client.configuration import Configuration
3027
from influxdb_client.rest import _requires_create_user_session, _requires_expire_user_session
3128

3229

@@ -52,10 +49,10 @@ class ApiClientAsync(object):
5249
to the API. More threads means more concurrent API requests.
5350
"""
5451

55-
PRIMITIVE_TYPES = (float, bool, bytes, six.text_type) + six.integer_types
52+
PRIMITIVE_TYPES = (float, bool, bytes, str, int)
5653
NATIVE_TYPES_MAPPING = {
5754
'int': int,
58-
'long': int if six.PY3 else long, # noqa: F821
55+
'long': int,
5956
'float': float,
6057
'str': str,
6158
'bool': bool,
@@ -231,11 +228,11 @@ def sanitize_for_serialization(self, obj):
231228
# Convert attribute name to json key in
232229
# model definition for request.
233230
obj_dict = {obj.attribute_map[attr]: getattr(obj, attr)
234-
for attr, _ in six.iteritems(obj.openapi_types)
231+
for attr, _ in obj.openapi_types.items()
235232
if getattr(obj, attr) is not None}
236233

237234
return {key: self.sanitize_for_serialization(val)
238-
for key, val in six.iteritems(obj_dict)}
235+
for key, val in obj_dict.items()}
239236

240237
def deserialize(self, response, response_type):
241238
"""Deserializes response into an object.
@@ -279,7 +276,7 @@ def __deserialize(self, data, klass):
279276
if klass.startswith('dict('):
280277
sub_kls = re.match(r'dict\(([^,]*), (.*)\)', klass).group(2)
281278
return {k: self.__deserialize(v, sub_kls)
282-
for k, v in six.iteritems(data)}
279+
for k, v in data.items()}
283280

284281
# convert str to class
285282
if klass in self.NATIVE_TYPES_MAPPING:
@@ -438,7 +435,7 @@ def parameters_to_tuples(self, params, collection_formats):
438435
new_params = []
439436
if collection_formats is None:
440437
collection_formats = {}
441-
for k, v in six.iteritems(params) if isinstance(params, dict) else params: # noqa: E501
438+
for k, v in params.items() if isinstance(params, dict) else params: # noqa: E501
442439
if k in collection_formats:
443440
collection_format = collection_formats[k]
444441
if collection_format == 'multi':
@@ -471,7 +468,7 @@ def prepare_post_parameters(self, post_params=None, files=None):
471468
params = post_params
472469

473470
if files:
474-
for k, v in six.iteritems(files):
471+
for k, v in files.items():
475472
if not v:
476473
continue
477474
file_names = v if type(v) is list else [v]
@@ -577,7 +574,7 @@ def __deserialize_primitive(self, data, klass):
577574
try:
578575
return klass(data)
579576
except UnicodeEncodeError:
580-
return six.text_type(data)
577+
return str(data)
581578
except TypeError:
582579
return data
583580

@@ -640,7 +637,7 @@ def __deserialize_model(self, data, klass):
640637

641638
kwargs = {}
642639
if klass.openapi_types is not None:
643-
for attr, attr_type in six.iteritems(klass.openapi_types):
640+
for attr, attr_type in klass.openapi_types.items():
644641
if (data is not None and
645642
klass.attribute_map[attr] in data and
646643
isinstance(data, (list, dict))):

‎influxdb_client/_async/rest.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,9 @@
1212
import json
1313
import re
1414
import ssl
15+
from urllib.parse import urlencode
1516

1617
import aiohttp
17-
# python 2 and python 3 compatibility library
18-
import six
19-
from six.moves.urllib.parse import urlencode
2018

2119
from influxdb_client.rest import ApiException
2220
from influxdb_client.rest import _UTF_8_encoding
@@ -111,7 +109,7 @@ def __init__(self, configuration, pools_size=4, maxsize=None, **kwargs):
111109
trace_config.on_request_end.append(_on_request_end)
112110

113111
# timeout
114-
if isinstance(configuration.timeout, (int, float,) if six.PY3 else (int, long, float,)): # noqa: E501,F821
112+
if isinstance(configuration.timeout, (int, float,)): # noqa: E501,F821
115113
timeout = aiohttp.ClientTimeout(total=configuration.timeout / 1_000)
116114
elif isinstance(configuration.timeout, aiohttp.ClientTimeout):
117115
timeout = configuration.timeout

‎influxdb_client/_sync/api_client.py

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,17 @@
1313
import datetime
1414
import json
1515
import mimetypes
16-
from multiprocessing.pool import ThreadPool
1716
import os
1817
import re
1918
import tempfile
19+
from multiprocessing.pool import ThreadPool
20+
from urllib.parse import quote
2021

21-
# python 2 and python 3 compatibility library
22-
import six
23-
from six.moves.urllib.parse import quote
24-
25-
from influxdb_client.configuration import Configuration
2622
import influxdb_client.domain
27-
from influxdb_client._sync import rest
2823
from influxdb_client import SigninService
2924
from influxdb_client import SignoutService
25+
from influxdb_client._sync import rest
26+
from influxdb_client.configuration import Configuration
3027
from influxdb_client.rest import _requires_create_user_session, _requires_expire_user_session
3128

3229

@@ -52,10 +49,10 @@ class ApiClient(object):
5249
to the API. More threads means more concurrent API requests.
5350
"""
5451

55-
PRIMITIVE_TYPES = (float, bool, bytes, six.text_type) + six.integer_types
52+
PRIMITIVE_TYPES = (float, bool, bytes, str, int)
5653
NATIVE_TYPES_MAPPING = {
5754
'int': int,
58-
'long': int if six.PY3 else long, # noqa: F821
55+
'long': int,
5956
'float': float,
6057
'str': str,
6158
'bool': bool,
@@ -231,11 +228,11 @@ def sanitize_for_serialization(self, obj):
231228
# Convert attribute name to json key in
232229
# model definition for request.
233230
obj_dict = {obj.attribute_map[attr]: getattr(obj, attr)
234-
for attr, _ in six.iteritems(obj.openapi_types)
231+
for attr, _ in obj.openapi_types.items()
235232
if getattr(obj, attr) is not None}
236233

237234
return {key: self.sanitize_for_serialization(val)
238-
for key, val in six.iteritems(obj_dict)}
235+
for key, val in obj_dict.items()}
239236

240237
def deserialize(self, response, response_type):
241238
"""Deserializes response into an object.
@@ -279,7 +276,7 @@ def __deserialize(self, data, klass):
279276
if klass.startswith('dict('):
280277
sub_kls = re.match(r'dict\(([^,]*), (.*)\)', klass).group(2)
281278
return {k: self.__deserialize(v, sub_kls)
282-
for k, v in six.iteritems(data)}
279+
for k, v in data.items()}
283280

284281
# convert str to class
285282
if klass in self.NATIVE_TYPES_MAPPING:
@@ -438,7 +435,7 @@ def parameters_to_tuples(self, params, collection_formats):
438435
new_params = []
439436
if collection_formats is None:
440437
collection_formats = {}
441-
for k, v in six.iteritems(params) if isinstance(params, dict) else params: # noqa: E501
438+
for k, v in params.items() if isinstance(params, dict) else params: # noqa: E501
442439
if k in collection_formats:
443440
collection_format = collection_formats[k]
444441
if collection_format == 'multi':
@@ -471,7 +468,7 @@ def prepare_post_parameters(self, post_params=None, files=None):
471468
params = post_params
472469

473470
if files:
474-
for k, v in six.iteritems(files):
471+
for k, v in files.items():
475472
if not v:
476473
continue
477474
file_names = v if type(v) is list else [v]
@@ -577,7 +574,7 @@ def __deserialize_primitive(self, data, klass):
577574
try:
578575
return klass(data)
579576
except UnicodeEncodeError:
580-
return six.text_type(data)
577+
return str(data)
581578
except TypeError:
582579
return data
583580

@@ -640,7 +637,7 @@ def __deserialize_model(self, data, klass):
640637

641638
kwargs = {}
642639
if klass.openapi_types is not None:
643-
for attr, attr_type in six.iteritems(klass.openapi_types):
640+
for attr, attr_type in klass.openapi_types.items():
644641
if (data is not None and
645642
klass.attribute_map[attr] in data and
646643
isinstance(data, (list, dict))):

‎influxdb_client/_sync/rest.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@
1616
import json
1717
import re
1818
import ssl
19-
20-
# python 2 and python 3 compatibility library
21-
import six
22-
from six.moves.urllib.parse import urlencode
19+
from urllib.parse import urlencode
2320

2421
from influxdb_client.rest import ApiException
2522

@@ -157,7 +154,7 @@ def request(self, method, url, query_params=None, headers=None,
157154
timeout = None
158155
_configured_timeout = _request_timeout or self.configuration.timeout
159156
if _configured_timeout:
160-
if isinstance(_configured_timeout, (int, float, ) if six.PY3 else (int, long, float, )): # noqa: E501,F821
157+
if isinstance(_configured_timeout, (int, float, )): # noqa: E501,F821
161158
timeout = urllib3.Timeout(total=_configured_timeout / 1_000)
162159
elif (isinstance(_configured_timeout, tuple) and
163160
len(_configured_timeout) == 2):
@@ -240,8 +237,7 @@ def request(self, method, url, query_params=None, headers=None,
240237

241238
# In the python 3, the response.data is bytes.
242239
# we need to decode it to string.
243-
if six.PY3:
244-
r.data = r.data.decode('utf8')
240+
r.data = r.data.decode('utf8')
245241

246242
if not 200 <= r.status <= 299:
247243
raise ApiException(http_resp=r)

‎influxdb_client/client/write/point.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
from numbers import Integral
88

99
from pytz import UTC
10-
from six import iteritems
1110

1211
from influxdb_client.client.util.date_utils import get_date_helper
1312
from influxdb_client.domain.write_precision import WritePrecision
@@ -50,7 +49,7 @@ class Point(object):
5049
"""
5150
Point defines the values that will be written to the database.
5251
53-
Ref: http://bit.ly/influxdata-point
52+
Ref: https://docs.influxdata.com/influxdb/latest/reference/key-concepts/data-elements/#point
5453
"""
5554

5655
@staticmethod
@@ -209,7 +208,7 @@ def __str__(self):
209208

210209
def _append_tags(tags):
211210
_return = []
212-
for tag_key, tag_value in sorted(iteritems(tags)):
211+
for tag_key, tag_value in sorted(tags.items()):
213212

214213
if tag_value is None:
215214
continue
@@ -225,7 +224,7 @@ def _append_tags(tags):
225224
def _append_fields(fields):
226225
_return = []
227226

228-
for field, value in sorted(iteritems(fields)):
227+
for field, value in sorted(fields.items()):
229228
if value is None:
230229
continue
231230

‎influxdb_client/configuration.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,12 @@
1313
from __future__ import absolute_import
1414

1515
import copy
16+
import http.client as httplib
1617
import logging
1718
import multiprocessing
1819
import sys
19-
import urllib3
2020

21-
import six
22-
from six.moves import http_client as httplib
21+
import urllib3
2322

2423

2524
class TypeWithDefault(type):
@@ -45,7 +44,7 @@ def set_default(cls, default):
4544
cls._default = copy.copy(default)
4645

4746

48-
class Configuration(six.with_metaclass(TypeWithDefault, object)):
47+
class Configuration(object, metaclass=TypeWithDefault):
4948
"""NOTE: This class is auto generated by OpenAPI Generator.
5049
5150
Ref: https://openapi-generator.tech
@@ -143,7 +142,7 @@ def logger_file(self, value):
143142
# then add file handler and remove stream handler.
144143
self.logger_file_handler = logging.FileHandler(self.__logger_file)
145144
self.logger_file_handler.setFormatter(self.logger_formatter)
146-
for _, logger in six.iteritems(self.loggers):
145+
for _, logger in self.loggers.items():
147146
logger.addHandler(self.logger_file_handler)
148147

149148
@property
@@ -165,14 +164,14 @@ def debug(self, value):
165164
self.__debug = value
166165
if self.__debug:
167166
# if debug status is True, turn on debug logging
168-
for _, logger in six.iteritems(self.loggers):
167+
for _, logger in self.loggers.items():
169168
logger.setLevel(logging.DEBUG)
170169
# turn on httplib debug
171170
httplib.HTTPConnection.debuglevel = 1
172171
else:
173172
# if debug status is False, turn off debug logging,
174173
# setting log level to default `logging.WARNING`
175-
for _, logger in six.iteritems(self.loggers):
174+
for _, logger in self.loggers.items():
176175
logger.setLevel(logging.WARNING)
177176
# turn off httplib debug
178177
httplib.HTTPConnection.debuglevel = 0

‎influxdb_client/domain/add_resource_member_request_body.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
import pprint
1414
import re # noqa: F401
1515

16-
import six
17-
1816

1917
class AddResourceMemberRequestBody(object):
2018
"""NOTE: This class is auto generated by OpenAPI Generator.
@@ -93,7 +91,7 @@ def to_dict(self):
9391
"""Return the model properties as a dict."""
9492
result = {}
9593

96-
for attr, _ in six.iteritems(self.openapi_types):
94+
for attr, _ in self.openapi_types.items():
9795
value = getattr(self, attr)
9896
if isinstance(value, list):
9997
result[attr] = list(map(

‎influxdb_client/domain/analyze_query_response.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
import pprint
1414
import re # noqa: F401
1515

16-
import six
17-
1816

1917
class AnalyzeQueryResponse(object):
2018
"""NOTE: This class is auto generated by OpenAPI Generator.
@@ -69,7 +67,7 @@ def to_dict(self):
6967
"""Return the model properties as a dict."""
7068
result = {}
7169

72-
for attr, _ in six.iteritems(self.openapi_types):
70+
for attr, _ in self.openapi_types.items():
7371
value = getattr(self, attr)
7472
if isinstance(value, list):
7573
result[attr] = list(map(

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy