Merge branch 'master' of github.com:softlayer/softlayer-python

Author: allmightyspiff

.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"

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

SoftLayer/API.py

@@ -6,7 +6,6 @@
     :license: MIT, see LICENSE for more details.
 """
 # pylint: disable=invalid-name
-from __future__ import generators
 import warnings
 
 

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)

SoftLayer/CLI/core.py

@@ -5,11 +5,11 @@
 
     :license: MIT, see LICENSE for more details.
 """
-from __future__ import print_function
 import logging
 import os
 import sys
 import time
+import traceback
 import types
 
 import click
@@ -197,7 +197,6 @@ def main(reraise_exceptions=False, **kwargs):
         if reraise_exceptions:
             raise
 
-        import traceback
         print("An unexpected error has occured:")
         print(str(traceback.format_exc()))
         print("Feel free to report this error as it is likely a bug:")

SoftLayer/CLI/deprecated.py

@@ -4,12 +4,11 @@
     Handles usage of the deprecated command name, 'sl'.
     :license: MIT, see LICENSE for more details.
 """
-from __future__ import print_function
 import sys
 
 
 def main():
     """Main function for the deprecated 'sl' command."""
     print("ERROR: Use the 'slcli' command instead.", file=sys.stderr)
     print("> slcli %s" % ' '.join(sys.argv[1:]), file=sys.stderr)
-    exit(-1)
+    sys.exit(-1)

SoftLayer/CLI/firewall/edit.py

@@ -154,11 +154,9 @@ def cli(env, identifier):
             try:
                 rules = parse_rules(edited_rules)
                 if firewall_type == 'vlan':
-                    rules = mgr.edit_dedicated_fwl_rules(firewall_id,
-                                                         rules)
+                    mgr.edit_dedicated_fwl_rules(firewall_id, rules)
                 else:
-                    rules = mgr.edit_standard_fwl_rules(firewall_id,
-                                                        rules)
+                    mgr.edit_standard_fwl_rules(firewall_id, rules)
                 break
             except (SoftLayer.SoftLayerError, ValueError) as error:
                 env.out("Unexpected error({%s})" % (error))
@@ -169,10 +167,8 @@ def cli(env, identifier):
                     if formatting.confirm("Would you like to submit the "
                                           "rules. Continue?"):
                         continue
-                    else:
-                        raise exceptions.CLIAbort('Aborted.')
-                else:
                     raise exceptions.CLIAbort('Aborted.')
-                env.fout('Firewall updated!')
+                raise exceptions.CLIAbort('Aborted.')
+        env.fout('Firewall updated!')
     else:
         raise exceptions.CLIAbort('Aborted.')

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

SoftLayer/CLI/loadbal/pools.py

@@ -177,7 +177,7 @@ def l7pool_add(env, identifier, **args):
         'protocol': args.get('protocol')
     }
 
-    pool_members = [member for member in args.get('server')]
+    pool_members = list(args.get('server'))
 
     pool_health = {
         'interval': args.get('healthinterval'),

SoftLayer/CLI/report/bandwidth.py

@@ -1,5 +1,4 @@
 """Metric Utilities"""
-from __future__ import print_function
 import datetime
 import itertools
 import sys