Merge pull request #1661 from allmightyspiff/toxFixes

Fixed TOX errors

SoftLayer/CLI/environment.py

@@ -17,7 +17,7 @@
 from SoftLayer.CLI import formatting
 from SoftLayer.CLI import routes
 
-# pylint: disable=too-many-instance-attributes, invalid-name, no-self-use
+# pylint: disable=too-many-instance-attributes, invalid-name
 
 # Calling pkg_resources.iter_entry_points shows a false-positive
 # pylint: disable=no-member

SoftLayer/auth.py

@@ -5,7 +5,7 @@
 
     :license: MIT, see LICENSE for more details.
 """
-# pylint: disable=no-self-use
+
 
 __all__ = [
     'BasicAuthentication',

SoftLayer/managers/account.py

@@ -12,7 +12,7 @@
 from SoftLayer import utils
 
 # Invalid names are ignored due to long method names and short argument names
-# pylint: disable=invalid-name, no-self-use
+# pylint: disable=invalid-name
 
 LOGGER = logging.getLogger(__name__)
 

SoftLayer/managers/cdn.py

@@ -9,7 +9,7 @@
 from SoftLayer import utils
 
 
-# pylint: disable=no-self-use,too-many-lines,too-many-instance-attributes
+# pylint: disable=too-many-lines,too-many-instance-attributes
 
 
 class CDNManager(utils.IdentifierMixin, object):

SoftLayer/managers/dedicated_host.py

@@ -13,7 +13,7 @@
 from SoftLayer import utils
 
 # Invalid names are ignored due to long method names and short argument names
-# pylint: disable=invalid-name, no-self-use
+# pylint: disable=invalid-name
 
 LOGGER = logging.getLogger(__name__)
 

SoftLayer/managers/email.py

@@ -10,7 +10,7 @@
 
 
 # Invalid names are ignored due to long method names and short argument names
-# pylint: disable=invalid-name, no-self-use
+# pylint: disable=invalid-name
 
 
 class EmailManager(utils.IdentifierMixin, object):

SoftLayer/managers/hardware.py

@@ -20,7 +20,7 @@
 LOGGER = logging.getLogger(__name__)
 
 # Invalid names are ignored due to long method names and short argument names
-# pylint: disable=invalid-name, no-self-use, too-many-lines
+# pylint: disable=invalid-name, too-many-lines
 
 EXTRA_CATEGORIES = ['pri_ipv6_addresses',
                     'static_ipv6_addresses',

SoftLayer/managers/ordering.py

@@ -5,7 +5,7 @@
 
     :license: MIT, see LICENSE for more details.
 """
-# pylint: disable=no-self-use
+
 
 from re import match
 

SoftLayer/managers/storage.py

@@ -25,7 +25,7 @@ def __init__(self, client):
         self.client = client
         self.resolvers = [self._get_ids_from_username]
 
-    def _get_ids_from_username(self, username):  # pylint: disable=unused-argument,no-self-use
+    def _get_ids_from_username(self, username):  # pylint: disable=unused-argument
         """Should only be actually called from the block/file manager"""
         return []
 

SoftLayer/managers/vs.py

@@ -28,7 +28,7 @@
                     'software_guard_extensions']
 
 
-# pylint: disable=no-self-use,too-many-lines
+# pylint: disable=,too-many-lines
 
 
 class VSManager(utils.IdentifierMixin, object):
@@ -360,7 +360,7 @@ def get_create_options(self, vsi_type="PUBLIC_CLOUD_SERVER", datacenter=None):
                     'prices': get_item_price(item['prices'], location_group_id)
                 })
 
-            elif category.__contains__('guest_disk'):
+            elif 'guest_disk' in category:
                 local_disk.append({
                     'name': item['description'],
                     'capacity': item['capacity'],
@@ -1043,7 +1043,7 @@ def upgrade(self, instance_id, cpus=None, memory=None, nic_speed=None, public=Tr
             disk_number = 0
             vsi_disk = self.get_instance(instance_id)
             for item in vsi_disk.get('billingItem').get('children'):
-                if item.get('categoryCode').__contains__('guest_disk'):
+                if 'guest_disk' in item.get('categoryCode'):
                     if disk_number < int("".join(filter(str.isdigit, item.get('categoryCode')))):
                         disk_number = int("".join(filter(str.isdigit, item.get('categoryCode'))))
             for disk_guest in disk:

SoftLayer/managers/vs_capacity.py

@@ -14,7 +14,7 @@
 from SoftLayer import utils
 
 # Invalid names are ignored due to long method names and short argument names
-# pylint: disable=invalid-name, no-self-use
+# pylint: disable=invalid-name
 
 LOGGER = logging.getLogger(__name__)
 

SoftLayer/managers/vs_placement.py

@@ -11,7 +11,7 @@
 from SoftLayer import utils
 
 # Invalid names are ignored due to long method names and short argument names
-# pylint: disable=invalid-name, no-self-use
+# pylint: disable=invalid-name
 
 LOGGER = logging.getLogger(__name__)
 

SoftLayer/transports/__init__.py

@@ -17,7 +17,7 @@
 from .xmlrpc import XmlRpcTransport
 
 # transports.Request does have a lot of instance attributes. :(
-# pylint: disable=too-many-instance-attributes, no-self-use
+# pylint: disable=too-many-instance-attributes
 
 __all__ = [
     'Request',

SoftLayer/transports/transport.py

@@ -30,7 +30,7 @@ def get_session(user_agent):
 
 
 # transports.Request does have a lot of instance attributes. :(
-# pylint: disable=too-many-instance-attributes, no-self-use
+# pylint: disable=too-many-instance-attributes
 class Request(object):
     """Transport request object."""
 

tox.ini

@@ -31,8 +31,6 @@ commands =
            -r n \
            --ignore=tests,fixtures \
            -d too-many-locals \
-           -d star-args \
-           -d redefined-variable-type \
            -d locally-disabled \
            -d no-else-return \ 
            -d len-as-condition \