Merge pull request #1169 from camporter/drop_python2

allmightyspiff · web-flow · commit 81c4231f0a36 · 2019-09-24T15:22:39.000-05:00
Drop python2.7 support
diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,7 @@ matrix:
     - python: "3.7"
       env: TOX_ENV=py37
     - python: "pypy3.5"
-      env: TOX_ENV=pypy
+      env: TOX_ENV=pypy3
     - python: "3.6"
       env: TOX_ENV=analysis
     - python: "3.6"
diff --git a/README.rst b/README.rst
@@ -124,14 +124,13 @@ If you are using the library directly in python, you can do something like this.
 
 System Requirements
 -------------------
-* Python 2.7, 3.3, 3.4, 3.5, 3.6, or 3.7.
+* Python 3.5, 3.6, or 3.7.
 * A valid SoftLayer API username and key.
 * A connection to SoftLayer's private network is required to use
   our private network API endpoints.
 
 Python Packages
 ---------------
-* six >= 1.7.0
 * ptable >= 0.9.2
 * click >= 7
 * requests >= 2.20.0
diff --git a/SoftLayer/API.py b/SoftLayer/API.py
@@ -6,7 +6,6 @@
     :license: MIT, see LICENSE for more details.
 """
 # pylint: disable=invalid-name
-from __future__ import generators
 import warnings
 
 
diff --git a/SoftLayer/CLI/config/setup.py b/SoftLayer/CLI/config/setup.py
@@ -1,5 +1,6 @@
 """Setup CLI configuration."""
 # :license: MIT, see LICENSE for more details.
+import configparser
 import os.path
 
 import click
@@ -9,7 +10,6 @@
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import exceptions
 from SoftLayer.CLI import formatting
-from SoftLayer import utils
 
 
 def get_api_key(client, username, secret):
@@ -65,11 +65,11 @@ def cli(env):
 
     # Persist the config file. Read the target config file in before
     # setting the values to avoid clobbering settings
-    parsed_config = utils.configparser.RawConfigParser()
+    parsed_config = configparser.RawConfigParser()
     parsed_config.read(config_path)
     try:
         parsed_config.add_section('softlayer')
-    except utils.configparser.DuplicateSectionError:
+    except configparser.DuplicateSectionError:
         pass
 
     parsed_config.set('softlayer', 'username', username)
diff --git a/SoftLayer/CLI/core.py b/SoftLayer/CLI/core.py
@@ -5,7 +5,6 @@
 
     :license: MIT, see LICENSE for more details.
 """
-from __future__ import print_function
 import logging
 import os
 import sys
diff --git a/SoftLayer/CLI/deprecated.py b/SoftLayer/CLI/deprecated.py
@@ -4,7 +4,6 @@
     Handles usage of the deprecated command name, 'sl'.
     :license: MIT, see LICENSE for more details.
 """
-from __future__ import print_function
 import sys
 
 
diff --git a/SoftLayer/CLI/formatting.py b/SoftLayer/CLI/formatting.py
@@ -30,7 +30,7 @@ def format_output(data, fmt='table'):  # pylint: disable=R0911,R0912
                  SequentialOutput
     :param string fmt (optional): One of: table, raw, json, python
     """
-    if isinstance(data, utils.string_types):
+    if isinstance(data, str):
         if fmt in ('json', 'jsonraw'):
             return json.dumps(data)
         return data
diff --git a/SoftLayer/CLI/report/bandwidth.py b/SoftLayer/CLI/report/bandwidth.py
@@ -1,5 +1,4 @@
 """Metric Utilities"""
-from __future__ import print_function
 import datetime
 import itertools
 import sys
diff --git a/SoftLayer/CLI/template.py b/SoftLayer/CLI/template.py
@@ -9,10 +9,10 @@
 """
 
 # pylint: disable=redefined-argument-from-local
+import configparser
+import io
 import os.path
 
-from SoftLayer import utils
-
 
 class TemplateCallback(object):
     """Callback to use to populate click arguments with a template."""
@@ -24,11 +24,11 @@ def __call__(self, ctx, param, value):
         if value is None:
             return
 
-        config = utils.configparser.ConfigParser()
+        config = configparser.ConfigParser()
         ini_str = '[settings]\n' + open(
             os.path.expanduser(value), 'r').read()
-        ini_fp = utils.StringIO(ini_str)
-        config.readfp(ini_fp)
+        ini_fp = io.StringIO(ini_str)
+        config.read_file(ini_fp)
 
         # Merge template options with the options passed in
         args = {}
diff --git a/SoftLayer/config.py b/SoftLayer/config.py
@@ -5,11 +5,10 @@
 
     :license: MIT, see LICENSE for more details.
 """
+import configparser
 import os
 import os.path
 
-from SoftLayer import utils
-
 
 def get_client_settings_args(**kwargs):
     """Retrieve client settings from user-supplied arguments.
@@ -51,7 +50,7 @@ def get_client_settings_config_file(**kwargs):  # pylint: disable=inconsistent-r
     if kwargs.get('config_file'):
         config_files.append(kwargs.get('config_file'))
     config_files = [os.path.expanduser(f) for f in config_files]
-    config = utils.configparser.RawConfigParser({
+    config = configparser.RawConfigParser({
         'username': '',
         'api_key': '',
         'endpoint_url': '',
diff --git a/SoftLayer/shell/core.py b/SoftLayer/shell/core.py
@@ -5,7 +5,6 @@
 
     :license: MIT, see LICENSE for more details.
 """
-from __future__ import print_function
 import copy
 import os
 import shlex
diff --git a/SoftLayer/testing/__init__.py b/SoftLayer/testing/__init__.py
@@ -6,7 +6,6 @@
 """
 # Disable pylint import error and too many methods error
 # pylint: disable=invalid-name
-from __future__ import print_function
 import logging
 import os.path
 
@@ -79,7 +78,7 @@ def _mock_key(service, method):
 
 
 class TestCase(testtools.TestCase):
-    """Testcase class with PEP-8 compatable method names."""
+    """Testcase class with PEP-8 compatible method names."""
 
     @classmethod
     def setUpClass(cls):
diff --git a/SoftLayer/testing/xmlrpc.py b/SoftLayer/testing/xmlrpc.py
@@ -5,10 +5,10 @@
 
     :license: MIT, see LICENSE for more details.
 """
+import http.server
 import logging
 import threading
-
-import six
+import xmlrpc.client
 
 import SoftLayer
 from SoftLayer import transports
@@ -17,23 +17,23 @@
 # pylint: disable=invalid-name, broad-except, arguments-differ
 
 
-class TestServer(six.moves.BaseHTTPServer.HTTPServer):
+class TestServer(http.server.HTTPServer):
     """Test HTTP server which holds a given transport."""
 
     def __init__(self, transport, *args, **kw):
-        six.moves.BaseHTTPServer.HTTPServer.__init__(self, *args, **kw)
+        http.server.HTTPServer.__init__(self, *args, **kw)
         self.transport = transport
 
 
-class TestHandler(six.moves.BaseHTTPServer.BaseHTTPRequestHandler):
+class TestHandler(http.server.BaseHTTPRequestHandler):
     """Test XML-RPC Handler which converts XML-RPC to transport requests."""
 
     def do_POST(self):
         """Handle XML-RPC POSTs."""
         try:
             length = int(self.headers['Content-Length'])
             data = self.rfile.read(length).decode('utf-8')
-            args, method = utils.xmlrpc_client.loads(data)
+            args, method = xmlrpc.client.loads(data)
             headers = args[0].get('headers', {})
 
             # Form Request for the transport
@@ -54,9 +54,9 @@ def do_POST(self):
             # Get response
             response = self.server.transport(req)
 
-            response_body = utils.xmlrpc_client.dumps((response,),
-                                                      allow_none=True,
-                                                      methodresponse=True)
+            response_body = xmlrpc.client.dumps((response,),
+                                                allow_none=True,
+                                                methodresponse=True)
 
             self.send_response(200)
             self.send_header("Content-type", "application/xml; charset=UTF-8")
@@ -69,10 +69,10 @@ def do_POST(self):
         except SoftLayer.SoftLayerAPIError as ex:
             self.send_response(200)
             self.end_headers()
-            response = utils.xmlrpc_client.Fault(ex.faultCode, str(ex.reason))
-            response_body = utils.xmlrpc_client.dumps(response,
-                                                      allow_none=True,
-                                                      methodresponse=True)
+            response = xmlrpc.client.Fault(ex.faultCode, str(ex.reason))
+            response_body = xmlrpc.client.dumps(response,
+                                                allow_none=True,
+                                                methodresponse=True)
             self.wfile.write(response_body.encode('utf-8'))
         except Exception as ex:
             self.send_response(500)
diff --git a/SoftLayer/transports.py b/SoftLayer/transports.py
@@ -10,6 +10,7 @@
 import logging
 import re
 import time
+import xmlrpc.client
 
 import requests
 from requests.adapters import HTTPAdapter
@@ -200,9 +201,9 @@ def __call__(self, request):
         request.transport_headers.setdefault('User-Agent', self.user_agent)
 
         request.url = '/'.join([self.endpoint_url, request.service])
-        request.payload = utils.xmlrpc_client.dumps(tuple(largs),
-                                                    methodname=request.method,
-                                                    allow_none=True)
+        request.payload = xmlrpc.client.dumps(tuple(largs),
+                                              methodname=request.method,
+                                              allow_none=True)
 
         # Prefer the request setting, if it's not None
         verify = request.verify
@@ -220,13 +221,13 @@ def __call__(self, request):
                                        proxies=_proxies_dict(self.proxy))
 
             resp.raise_for_status()
-            result = utils.xmlrpc_client.loads(resp.content)[0][0]
+            result = xmlrpc.client.loads(resp.content)[0][0]
             if isinstance(result, list):
                 return SoftLayerListResult(
                     result, int(resp.headers.get('softlayer-total-items', 0)))
             else:
                 return result
-        except utils.xmlrpc_client.Fault as ex:
+        except xmlrpc.client.Fault as ex:
             # These exceptions are formed from the XML-RPC spec
             # http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php
             error_mapping = {
diff --git a/SoftLayer/utils.py b/SoftLayer/utils.py
@@ -9,18 +9,11 @@
 import re
 import time
 
-import six
-
 # pylint: disable=no-member, invalid-name
 
 UUID_RE = re.compile(r'^[0-9a-f\-]{36}$', re.I)
 KNOWN_OPERATIONS = ['<=', '>=', '<', '>', '~', '!~', '*=', '^=', '$=', '_=']
 
-configparser = six.moves.configparser
-string_types = six.string_types
-StringIO = six.StringIO
-xmlrpc_client = six.moves.xmlrpc_client
-
 
 def lookup(dic, key, *keys):
     """A generic dictionary access helper.
@@ -91,7 +84,7 @@ def query_filter(query):
     except ValueError:
         pass
 
-    if isinstance(query, string_types):
+    if isinstance(query, str):
         query = query.strip()
         for operation in KNOWN_OPERATIONS:
             if query.startswith(operation):
diff --git a/setup.py b/setup.py
@@ -29,8 +29,8 @@
             'sl = SoftLayer.CLI.deprecated:main',
         ],
     },
+    python_requires='>=3.5',
     install_requires=[
-        'six >= 1.7.0',
         'ptable >= 0.9.2',
         'click >= 7',
         'requests >= 2.20.0',
@@ -48,11 +48,9 @@
         'Operating System :: OS Independent',
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
     ],
diff --git a/tests/CLI/core_tests.py b/tests/CLI/core_tests.py
@@ -4,16 +4,16 @@
 
     :license: MIT, see LICENSE for more details.
 """
+import io
 import logging
 
+import click
+import mock
+
 import SoftLayer
 from SoftLayer.CLI import core
 from SoftLayer.CLI import environment
 from SoftLayer import testing
-from SoftLayer import utils
-
-import click
-import mock
 
 
 class CoreTests(testing.TestCase):
@@ -56,7 +56,7 @@ def test_diagnostics(self):
 class CoreMainTests(testing.TestCase):
 
     @mock.patch('SoftLayer.CLI.core.cli.main')
-    @mock.patch('sys.stdout', new_callable=utils.StringIO)
+    @mock.patch('sys.stdout', new_callable=io.StringIO)
     def test_unexpected_error(self, stdoutmock, climock):
         climock.side_effect = AttributeError('Attribute foo does not exist')
 
@@ -70,7 +70,7 @@ def test_unexpected_error(self, stdoutmock, climock):
                       stdoutmock.getvalue())
 
     @mock.patch('SoftLayer.CLI.core.cli.main')
-    @mock.patch('sys.stdout', new_callable=utils.StringIO)
+    @mock.patch('sys.stdout', new_callable=io.StringIO)
     def test_sl_error(self, stdoutmock, climock):
         ex = SoftLayer.SoftLayerAPIError('SoftLayer_Exception', 'Not found')
         climock.side_effect = ex
@@ -81,7 +81,7 @@ def test_sl_error(self, stdoutmock, climock):
                       stdoutmock.getvalue())
 
     @mock.patch('SoftLayer.CLI.core.cli.main')
-    @mock.patch('sys.stdout', new_callable=utils.StringIO)
+    @mock.patch('sys.stdout', new_callable=io.StringIO)
     def test_auth_error(self, stdoutmock, climock):
         ex = SoftLayer.SoftLayerAPIError('SoftLayer_Exception',
                                          'Invalid API token.')
diff --git a/tests/CLI/deprecated_tests.py b/tests/CLI/deprecated_tests.py
diff --git a/tests/CLI/helper_tests.py b/tests/CLI/helper_tests.py
diff --git a/tests/CLI/modules/call_api_tests.py b/tests/CLI/modules/call_api_tests.py
diff --git a/tests/config_tests.py b/tests/config_tests.py
diff --git a/tests/transport_tests.py b/tests/transport_tests.py
diff --git a/tools/requirements.txt b/tools/requirements.txt
diff --git a/tools/test-requirements.txt b/tools/test-requirements.txt
diff --git a/tox.ini b/tox.ini

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`"""Metric Utilities"""`
`2`		`-from __future__ import print_function`
`3`	`2`	`import datetime`
`4`	`3`	`import itertools`
`5`	`4`	`import sys`