refactor(pkg): python 2 support removal

BREAKING CHANGE: drop python 2 support

Author: KaiSchwarz-cnic

.travis.yml

@@ -1,5 +1,5 @@
 language: python
-dist: trusty
+dist: xenial
 notifications:
   email:
     recipients:
@@ -12,8 +12,10 @@ notifications:
     on_success: always
     on_failure: always
 python:
-  - '2.7'
+  - '3.4'
+  - '3.5'
   - '3.6'
+  - '3.7'
 cache:
   directories:
   - "~/.npm"

hexonet/apiconnector/apiclient.py

@@ -11,11 +11,9 @@
 from hexonet.apiconnector.response import Response
 from hexonet.apiconnector.responsetemplatemanager import ResponseTemplateManager as RTM
 from hexonet.apiconnector.socketconfig import SocketConfig
-from six.moves.urllib.parse import quote, unquote
-from six import string_types
+from urllib.parse import quote, unquote, urlparse, urlencode
+from urllib.request import urlopen, Request
 import re
-from six.moves.urllib.request import urlopen, Request
-from six.moves.urllib.parse import urlparse, urlencode
 import copy
 import platform
 
@@ -57,8 +55,8 @@ def getPOSTData(self, cmd):
         """
         data = self.__socketConfig.getPOSTData()
         tmp = ""
-        if not isinstance(cmd, string_types):
-            for key in cmd.keys():
+        if not isinstance(cmd, str):
+            for key in sorted(cmd.keys()):
                 if (cmd[key] is not None):
                     tmp += ("{0}={1}\n").format(key, re.sub('[\r\n]', '', str(cmd[key])))
         return ("{0}{1}={2}").format(data, quote('s_command'), quote(re.sub('\n$', '', tmp)))
@@ -216,11 +214,11 @@ def request(self, cmd):
             })
             body = urlopen(req, timeout=self.__socketTimeout).read()
             if (self.__debugMode):
-                print(self.__socketURL, data, body, '\n', '\n')
+                print((self.__socketURL, data, body, '\n', '\n'))
         except Exception:
             body = rtm.getTemplate("httperror").getPlain()
             if (self.__debugMode):
-                print(self.__socketURL, data, "HTTP communication failed", body, '\n', '\n')
+                print((self.__socketURL, data, "HTTP communication failed", body, '\n', '\n'))
         return Response(body, cmd)
 
     def requestNextResponsePage(self, rr):
@@ -293,6 +291,6 @@ def __toUpperCaseKeys(self, cmd):
         Translate all command parameter names to uppercase
         """
         newcmd = {}
-        for k in cmd.keys():
+        for k in list(cmd.keys()):
             newcmd[k.upper()] = cmd[k]
         return newcmd

hexonet/apiconnector/response.py

@@ -37,7 +37,7 @@ def __init__(self, raw, cmd=None):
 
         h = self.getHash()
         if ("PROPERTY" in h):
-            colKeys = h["PROPERTY"].keys()
+            colKeys = list(h["PROPERTY"].keys())
             count = 0
             for c in colKeys:
                 d = h["PROPERTY"][c]

hexonet/apiconnector/responsetemplatemanager.py

@@ -70,7 +70,7 @@ def getTemplates(self):
         Return all available response templates
         """
         tpls = {}
-        for key in self.__templates.keys():
+        for key in list(self.__templates.keys()):
             tpls[key] = RT(self.__templates[key])
         return tpls
 

hexonet/apiconnector/socketconfig.py

@@ -8,7 +8,7 @@
     :license: MIT, see LICENSE for more details.
 """
 
-from six.moves.urllib.parse import quote, unquote
+from urllib.parse import quote, unquote
 
 
 class SocketConfig(object):

requirements.txt

@@ -5,7 +5,6 @@ m2r==0.2.1
 pep8==1.7.1
 pycodestyle==2.5.0
 -e git://github.com/pytest-dev/pytest-cov@master#egg=pytestcov
-six==1.12.0
 Sphinx==1.8.5
 sphinxcontrib-log-cabinet==1.0.0
 sphinxcontrib-websupport==1.1.0

scripts/coverage.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 rm -rf .pytest_cache htmlcov tests/__pycache___
-py.test --strict --cov-report html --cov=hexonet.apiconnector --cache-clear -v
+py.test --strict --cov-report html --cache-clear -v
 # NOTE: this does not use the current repository
 # it uses the last released version's source code
 # maybe this can be reviewed - but not sure if this is possible

setup.py

@@ -42,7 +42,6 @@ def find_version(*file_paths):
     url='https://github.com/hexonet/python-sdk/',
     install_require=[
         'autopep8',
-        'six',
         'guzzle_sphinx_theme',
         'pycodestyle',
         'sphinx',
@@ -51,7 +50,6 @@ def find_version(*file_paths):
     ],
     setup_requires=[
         'autopep8',
-        'six',
         'guzzle_sphinx_theme',
         'pycodestyle',
         'sphinx',
@@ -63,7 +61,6 @@ def find_version(*file_paths):
     scripts=[],
     zip_safe=True,
     classifiers=(
-        "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent"

tests/test_apiclient.py

@@ -10,10 +10,10 @@ def test_apiclientmethods():
     rtm = RTM.getInstance()
     rtm.addTemplate(
         'login200',
-        '[RESPONSE]\r\nPROPERTY[SESSION][0]=h8JLZZHdF2WgWWXlwbKWzEG3XrzoW4y'
-        + 'shhvtqyg0LCYiX55QnhgYX9cB0W4mlpbx\r\nDESCRIPTION=Command completed'
-        + ' successfully\r\nCODE=200\r\nQUEUETIME=0\r\nRUNTIME=0.169\r\nEOF\r'
-        + '\n'
+        '[RESPONSE]\r\nPROPERTY[SESSION][0]=h8JLZZHdF2WgWWXlwbKWzEG3XrzoW4y' +
+        'shhvtqyg0LCYiX55QnhgYX9cB0W4mlpbx\r\nDESCRIPTION=Command completed' +
+        ' successfully\r\nCODE=200\r\nQUEUETIME=0\r\nRUNTIME=0.169\r\nEOF\r' +
+        '\n'
     )
     rtm.addTemplate(
         'login500',
@@ -25,50 +25,50 @@ def test_apiclientmethods():
     )
     rtm.addTemplate(
         'listP0',
-        '[RESPONSE]\r\nPROPERTY[TOTAL][0]=2701\r\nPROPERTY[FIRST][0]=0\r\nP'
-        + 'ROPERTY[DOMAIN][0]=0-60motorcycletimes.com\r\nPROPERTY[DOMAIN][1]='
-        + '0-be-s01-0.com\r\nPROPERTY[COUNT][0]=2\r\nPROPERTY[LAST][0]=1\r\nP'
-        + 'ROPERTY[LIMIT][0]=2\r\nDESCRIPTION=Command completed successfully'
-        + '\r\nCODE=200\r\nQUEUETIME=0\r\nRUNTIME=0.023\r\nEOF\r\n'
+        '[RESPONSE]\r\nPROPERTY[TOTAL][0]=2701\r\nPROPERTY[FIRST][0]=0\r\nP' +
+        'ROPERTY[DOMAIN][0]=0-60motorcycletimes.com\r\nPROPERTY[DOMAIN][1]=' +
+        '0-be-s01-0.com\r\nPROPERTY[COUNT][0]=2\r\nPROPERTY[LAST][0]=1\r\nP' +
+        'ROPERTY[LIMIT][0]=2\r\nDESCRIPTION=Command completed successfully' +
+        '\r\nCODE=200\r\nQUEUETIME=0\r\nRUNTIME=0.023\r\nEOF\r\n'
     )
     rtm.addTemplate(
         'listP1',
-        '[RESPONSE]\r\nPROPERTY[TOTAL][0]=2701\r\nPROPERTY[FIRST][0]=2\r\nP'
-        + 'ROPERTY[DOMAIN][0]=0-qas-ao17-0.org\r\nPROPERTY[DOMAIN][1]=0-sunny'
-        + 'da222y.com\r\nPROPERTY[COUNT][0]=2\r\nPROPERTY[LAST][0]=3\r\nPROPE'
-        + 'RTY[LIMIT][0]=2\r\nDESCRIPTION=Command completed successfully\r\nC'
-        + 'ODE=200\r\nQUEUETIME=0\r\nRUNTIME=0.032\r\nEOF\r\n'
+        '[RESPONSE]\r\nPROPERTY[TOTAL][0]=2701\r\nPROPERTY[FIRST][0]=2\r\nP' +
+        'ROPERTY[DOMAIN][0]=0-qas-ao17-0.org\r\nPROPERTY[DOMAIN][1]=0-sunny' +
+        'da222y.com\r\nPROPERTY[COUNT][0]=2\r\nPROPERTY[LAST][0]=3\r\nPROPE' +
+        'RTY[LIMIT][0]=2\r\nDESCRIPTION=Command completed successfully\r\nC' +
+        'ODE=200\r\nQUEUETIME=0\r\nRUNTIME=0.032\r\nEOF\r\n'
     )
     rtm.addTemplate(
         'listFP0',
-        '[RESPONSE]\r\nPROPERTY[TOTAL][0]=3\r\nPROPERTY[FIRST][0]=0\r\nPROP'
-        + 'ERTY[DOMAIN][0]=0-60motorcycletimes.com\r\nPROPERTY[COUNT][0]=1\r'
-        + '\nPROPERTY[LAST][0]=1\r\nPROPERTY[LIMIT][0]=1\r\nDESCRIPTION=Comma'
-        + 'nd completed successfully\r\nCODE=200\r\nQUEUETIME=0\r\nRUNTIME=0.'
-        + '023\r\nEOF\r\n'
+        '[RESPONSE]\r\nPROPERTY[TOTAL][0]=3\r\nPROPERTY[FIRST][0]=0\r\nPROP' +
+        'ERTY[DOMAIN][0]=0-60motorcycletimes.com\r\nPROPERTY[COUNT][0]=1\r' +
+        '\nPROPERTY[LAST][0]=1\r\nPROPERTY[LIMIT][0]=1\r\nDESCRIPTION=Comma' +
+        'nd completed successfully\r\nCODE=200\r\nQUEUETIME=0\r\nRUNTIME=0.' +
+        '023\r\nEOF\r\n'
     )
     rtm.addTemplate(
         'listFP1',
-        '[RESPONSE]\r\nPROPERTY[TOTAL][0]=3\r\nPROPERTY[FIRST][0]=1\r\nPROP'
-        + 'ERTY[DOMAIN][0]=0-be-s01-0.com\r\nPROPERTY[COUNT][0]=1\r\nPROPERTY'
-        + '[LAST][0]=2\r\nPROPERTY[LIMIT][0]=1\r\nDESCRIPTION=Command complet'
-        + 'ed successfully\r\nCODE=200\r\nQUEUETIME=0\r\nRUNTIME=0.032\r\nEOF'
-        + '\r\n'
+        '[RESPONSE]\r\nPROPERTY[TOTAL][0]=3\r\nPROPERTY[FIRST][0]=1\r\nPROP' +
+        'ERTY[DOMAIN][0]=0-be-s01-0.com\r\nPROPERTY[COUNT][0]=1\r\nPROPERTY' +
+        '[LAST][0]=2\r\nPROPERTY[LIMIT][0]=1\r\nDESCRIPTION=Command complet' +
+        'ed successfully\r\nCODE=200\r\nQUEUETIME=0\r\nRUNTIME=0.032\r\nEOF' +
+        '\r\n'
     )
     rtm.addTemplate(
         'listFP2',
-        '[RESPONSE]\r\nPROPERTY[TOTAL][0]=3\r\nPROPERTY[FIRST][0]=2\r\nPROP'
-        + 'ERTY[DOMAIN][0]=0-qas-ao17-0.org\r\nPROPERTY[COUNT][0]=2\r\nPROPER'
-        + 'TY[LAST][0]=3\r\nPROPERTY[LIMIT][0]=1\r\nDESCRIPTION=Command compl'
-        + 'eted successfully\r\nCODE=200\r\nQUEUETIME=0\r\nRUNTIME=0.032\r\nE'
-        + 'OF\r\n'
+        '[RESPONSE]\r\nPROPERTY[TOTAL][0]=3\r\nPROPERTY[FIRST][0]=2\r\nPROP' +
+        'ERTY[DOMAIN][0]=0-qas-ao17-0.org\r\nPROPERTY[COUNT][0]=2\r\nPROPER' +
+        'TY[LAST][0]=3\r\nPROPERTY[LIMIT][0]=1\r\nDESCRIPTION=Command compl' +
+        'eted successfully\r\nCODE=200\r\nQUEUETIME=0\r\nRUNTIME=0.032\r\nE' +
+        'OF\r\n'
     )
 
     # #.getPOSTData()
     # test object input with special chars
     validate = (
-        's_entity=54cd&s_command=COMMAND%3DModifyDomain%0AAUTH%3Dgwrgwqg%25'
-        + '%26%5C44t3%2A'
+        's_entity=54cd&s_command=AUTH%3Dgwrgwqg%25' +
+        '%26%5C44t3%2A%0ACOMMAND%3DModifyDomain'
     )
     enc = cl.getPOSTData({
         'COMMAND': 'ModifyDomain',
@@ -193,8 +193,7 @@ def test_apiclientmethods():
         'COMMAND': 'StatusAccount'
     })
     exp = (
-        's_entity=54cd&s_remoteaddr=10.10.10.10&s_command=COMMAND%3DStatusA'
-        + 'ccount'
+        's_entity=54cd&s_remoteaddr=10.10.10.10&s_command=COMMAND%3DStatusAccount'
     )
     assert tmp == exp
 
@@ -212,8 +211,7 @@ def test_apiclientmethods():
         'COMMAND': 'StatusAccount'
     })
     exp = (
-        's_entity=54cd&s_login=myaccountid&s_pw=mypassword&s_command=COMMAN'
-        + 'D%3DStatusAccount'
+        's_entity=54cd&s_login=myaccountid&s_pw=mypassword&s_command=COMMAND%3DStatusAccount'
     )
     assert tmp == exp
 
@@ -231,8 +229,7 @@ def test_apiclientmethods():
         'COMMAND': 'StatusAccount'
     })
     exp = (
-        's_entity=54cd&s_login=myaccountid%21myroleid&s_pw=mypassword&s_com'
-        + 'mand=COMMAND%3DStatusAccount'
+        's_entity=54cd&s_login=myaccountid%21myroleid&s_pw=mypassword&s_command=COMMAND%3DStatusAccount'
     )
     assert tmp == exp