Skip to content

Commit 2621ccd

Browse files
committed
fix: remove Python2 compatibility code
1 parent fb80e9e commit 2621ccd

File tree

108 files changed

+161
-358
lines changed

Some content is hidden

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

108 files changed

+161
-358
lines changed

fingerprint_pro_server_api_sdk/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
Generated by: https://github.com/swagger-api/swagger-codegen.git
1313
"""
1414

15-
from __future__ import absolute_import
16-
1715
# import apis into sdk package
1816
from fingerprint_pro_server_api_sdk.api.fingerprint_api import FingerprintApi
1917
# import ApiClient

fingerprint_pro_server_api_sdk/api/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from __future__ import absolute_import
2-
31
# flake8: noqa
42

53
# import apis into api package

fingerprint_pro_server_api_sdk/api/fingerprint_api.py

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,8 @@
1010
Generated by: https://github.com/swagger-api/swagger-codegen.git
1111
"""
1212

13-
from __future__ import absolute_import
14-
1513
import re # noqa: F401
1614

17-
# python 2 and python 3 compatibility library
18-
import six
19-
2015
from fingerprint_pro_server_api_sdk.api_client import ApiClient
2116
from fingerprint_pro_server_api_sdk.extend_exception import extend_exception
2217
from fingerprint_pro_server_api_sdk.rest import ApiException
@@ -79,7 +74,7 @@ def delete_visitor_data_with_http_info(self, visitor_id, **kwargs): # noqa: E50
7974
all_params.append('_request_timeout')
8075

8176
params = locals()
82-
for key, val in six.iteritems(params['kwargs']):
77+
for key, val in params['kwargs'].items():
8378
if key not in all_params:
8479
raise TypeError(
8580
"Got an unexpected keyword argument '%s'"
@@ -190,7 +185,7 @@ def get_event_with_http_info(self, request_id, **kwargs): # noqa: E501
190185
all_params.append('_request_timeout')
191186

192187
params = locals()
193-
for key, val in six.iteritems(params['kwargs']):
188+
for key, val in params['kwargs'].items():
194189
if key not in all_params:
195190
raise TypeError(
196191
"Got an unexpected keyword argument '%s'"
@@ -305,7 +300,7 @@ def get_visits_with_http_info(self, visitor_id, **kwargs): # noqa: E501
305300
all_params.append('_request_timeout')
306301

307302
params = locals()
308-
for key, val in six.iteritems(params['kwargs']):
303+
for key, val in params['kwargs'].items():
309304
if key not in all_params:
310305
raise TypeError(
311306
"Got an unexpected keyword argument '%s'"
@@ -422,7 +417,7 @@ def update_event_with_http_info(self, body, request_id, **kwargs): # noqa: E501
422417
all_params.append('_request_timeout')
423418

424419
params = locals()
425-
for key, val in six.iteritems(params['kwargs']):
420+
for key, val in params['kwargs'].items():
426421
if key not in all_params:
427422
raise TypeError(
428423
"Got an unexpected keyword argument '%s'"

fingerprint_pro_server_api_sdk/api_client.py

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,14 @@
88
99
Generated by: https://github.com/swagger-api/swagger-codegen.git
1010
"""
11-
from __future__ import absolute_import
12-
1311
import datetime
1412
import json
1513
import mimetypes
1614
import os
1715
import re
1816
import tempfile
1917

20-
# python 2 and python 3 compatibility library
21-
import six
22-
from six.moves.urllib.parse import quote
18+
from urllib.parse import quote
2319

2420
from fingerprint_pro_server_api_sdk.configuration import Configuration
2521
import fingerprint_pro_server_api_sdk.models
@@ -47,10 +43,10 @@ class ApiClient(object):
4743
to the API
4844
"""
4945

50-
PRIMITIVE_TYPES = (float, bool, bytes, six.text_type) + six.integer_types
46+
PRIMITIVE_TYPES = (float, bool, bytes, str, int)
5147
NATIVE_TYPES_MAPPING = {
5248
'int': int,
53-
'long': int if six.PY3 else long, # noqa: F821
49+
'long': int,
5450
'float': float,
5551
'str': str,
5652
'bool': bool,
@@ -216,11 +212,11 @@ def sanitize_for_serialization(self, obj):
216212
# Convert attribute name to json key in
217213
# model definition for request.
218214
obj_dict = {obj.attribute_map[attr]: getattr(obj, attr)
219-
for attr, _ in six.iteritems(obj.swagger_types)
215+
for attr, _ in obj.swagger_types.items()
220216
if getattr(obj, attr) is not None}
221217

222218
return {key: self.sanitize_for_serialization(val)
223-
for key, val in six.iteritems(obj_dict)}
219+
for key, val in obj_dict.items()}
224220

225221
def deserialize(self, response, response_type, is_error=False):
226222
"""Deserializes response into an object.
@@ -272,7 +268,7 @@ def __deserialize(self, data, klass):
272268
if klass.startswith('dict('):
273269
sub_kls = re.match(r'dict\(([^,]*), (.*)\)', klass).group(2)
274270
return {k: self.__deserialize(v, sub_kls)
275-
for k, v in six.iteritems(data)}
271+
for k, v in data.items()}
276272

277273
# convert str to class
278274
if klass in self.NATIVE_TYPES_MAPPING:
@@ -422,7 +418,7 @@ def parameters_to_tuples(self, params, collection_formats):
422418
new_params = []
423419
if collection_formats is None:
424420
collection_formats = {}
425-
for k, v in six.iteritems(params) if isinstance(params, dict) else params: # noqa: E501
421+
for k, v in params.items() if isinstance(params, dict) else params: # noqa: E501
426422
if k in collection_formats:
427423
collection_format = collection_formats[k]
428424
if collection_format == 'multi':
@@ -455,7 +451,7 @@ def prepare_post_parameters(self, post_params=None, files=None):
455451
params = post_params
456452

457453
if files:
458-
for k, v in six.iteritems(files):
454+
for k, v in files.items():
459455
if not v:
460456
continue
461457
file_names = v if type(v) is list else [v]
@@ -565,7 +561,7 @@ def __deserialize_primitive(self, data, klass):
565561
try:
566562
return klass(data)
567563
except UnicodeEncodeError:
568-
return six.text_type(data)
564+
return str(data)
569565
except TypeError:
570566
return data
571567

@@ -631,7 +627,7 @@ def __deserialize_model(self, data, klass):
631627

632628
kwargs = {}
633629
if klass.swagger_types is not None:
634-
for attr, attr_type in six.iteritems(klass.swagger_types):
630+
for attr, attr_type in klass.swagger_types.items():
635631
if (data is not None and
636632
klass.attribute_map[attr] in data and
637633
isinstance(data, (list, dict))):

fingerprint_pro_server_api_sdk/configuration.py

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,12 @@
1010
Generated by: https://github.com/swagger-api/swagger-codegen.git
1111
"""
1212

13-
from __future__ import absolute_import
14-
1513
import copy
1614
import logging
1715
import multiprocessing
1816
import sys
1917
import urllib3
20-
21-
import six
22-
from six.moves import http_client as httplib
18+
import http.client as httplib
2319

2420

2521
class Configuration(object):
@@ -130,7 +126,7 @@ def logger_file(self, value):
130126
# then add file handler and remove stream handler.
131127
self.logger_file_handler = logging.FileHandler(self.__logger_file)
132128
self.logger_file_handler.setFormatter(self.logger_formatter)
133-
for _, logger in six.iteritems(self.logger):
129+
for _, logger in self.logger.items():
134130
logger.addHandler(self.logger_file_handler)
135131
if self.logger_stream_handler:
136132
logger.removeHandler(self.logger_stream_handler)
@@ -139,7 +135,7 @@ def logger_file(self, value):
139135
# then add stream handler and remove file handler.
140136
self.logger_stream_handler = logging.StreamHandler()
141137
self.logger_stream_handler.setFormatter(self.logger_formatter)
142-
for _, logger in six.iteritems(self.logger):
138+
for _, logger in self.logger.items():
143139
logger.addHandler(self.logger_stream_handler)
144140
if self.logger_file_handler:
145141
logger.removeHandler(self.logger_file_handler)
@@ -163,14 +159,14 @@ def debug(self, value):
163159
self.__debug = value
164160
if self.__debug:
165161
# if debug status is True, turn on debug logging
166-
for _, logger in six.iteritems(self.logger):
162+
for _, logger in self.logger.items():
167163
logger.setLevel(logging.DEBUG)
168164
# turn on httplib debug
169165
httplib.HTTPConnection.debuglevel = 1
170166
else:
171167
# if debug status is False, turn off debug logging,
172168
# setting log level to default `logging.WARNING`
173-
for _, logger in six.iteritems(self.logger):
169+
for _, logger in self.logger.items():
174170
logger.setLevel(logging.WARNING)
175171
# turn off httplib debug
176172
httplib.HTTPConnection.debuglevel = 0
@@ -264,4 +260,4 @@ def to_debug_report(self):
264260
"Python Version: {pyversion}\n"\
265261
"Version of the API: 3\n"\
266262
"SDK Package Version: 6.0.0".\
267-
format(env=sys.platform, pyversion=sys.version)
263+
format(env=sys.platform, pyversion=sys.version)

fingerprint_pro_server_api_sdk/models/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
Generated by: https://github.com/swagger-api/swagger-codegen.git
1212
"""
1313

14-
from __future__ import absolute_import
15-
1614
# import models into model package
1715
from fingerprint_pro_server_api_sdk.models.asn import ASN
1816
from fingerprint_pro_server_api_sdk.models.botd_detection_result import BotdDetectionResult

fingerprint_pro_server_api_sdk/models/asn.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
class ASN(object):
1917
"""NOTE: This class is auto generated by the swagger code generator program.
2018
@@ -121,7 +119,7 @@ def to_dict(self):
121119
"""Returns the model properties as a dict"""
122120
result = {}
123121

124-
for attr, _ in six.iteritems(self.swagger_types):
122+
for attr, _ in self.swagger_types.items():
125123
value = getattr(self, attr)
126124
if isinstance(value, list):
127125
result[attr] = list(map(

fingerprint_pro_server_api_sdk/models/botd_detection_result.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
class BotdDetectionResult(object):
1917
"""
2018
Stores bot detection result
@@ -105,7 +103,7 @@ def to_dict(self):
105103
"""Returns the model properties as a dict"""
106104
result = {}
107105

108-
for attr, _ in six.iteritems(self.swagger_types):
106+
for attr, _ in self.swagger_types.items():
109107
value = getattr(self, attr)
110108
if isinstance(value, list):
111109
result[attr] = list(map(

fingerprint_pro_server_api_sdk/models/botd_result.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
class BotdResult(object):
1917
"""
2018
Contains all the information from Bot Detection product
@@ -238,7 +236,7 @@ def to_dict(self):
238236
"""Returns the model properties as a dict"""
239237
result = {}
240238

241-
for attr, _ in six.iteritems(self.swagger_types):
239+
for attr, _ in self.swagger_types.items():
242240
value = getattr(self, attr)
243241
if isinstance(value, list):
244242
result[attr] = list(map(

fingerprint_pro_server_api_sdk/models/browser_details.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
class BrowserDetails(object):
1917
"""NOTE: This class is auto generated by the swagger code generator program.
2018
@@ -256,7 +254,7 @@ def to_dict(self):
256254
"""Returns the model properties as a dict"""
257255
result = {}
258256

259-
for attr, _ in six.iteritems(self.swagger_types):
257+
for attr, _ in self.swagger_types.items():
260258
value = getattr(self, attr)
261259
if isinstance(value, list):
262260
result[attr] = list(map(

0 commit comments

Comments
 (0)