AutoPep8 fixes

allmightyspiff · allmightyspiff · commit 7da2e4dd1ae1 · 2022-04-25T14:58:15.000-05:00
diff --git a/SoftLayer/fixtures/SoftLayer_Account.py b/SoftLayer/fixtures/SoftLayer_Account.py
@@ -1173,7 +1173,7 @@
             "virtualizationPlatform": 0,
             "requiredUser": "administrator@vsphere.local"
         }
-    }
+}
 ]
 
 getActiveVirtualLicenses = [{
diff --git a/SoftLayer/fixtures/SoftLayer_Billing_Order.py b/SoftLayer/fixtures/SoftLayer_Billing_Order.py
@@ -44,7 +44,7 @@
         ],
         'orderApprovalDate': '2019-09-15T13:13:13-06:00',
         'orderTotalAmount': '0'
-    }]
+}]
 
 getObject = {
     'accountId': 1234,
diff --git a/SoftLayer/fixtures/SoftLayer_Network_Storage.py b/SoftLayer/fixtures/SoftLayer_Network_Storage.py
@@ -237,7 +237,7 @@
 }
 
 refreshDuplicate = {
-     'dependentDuplicate': 1
+    'dependentDuplicate': 1
 }
 
 convertCloneDependentToIndependent = {
diff --git a/SoftLayer/fixtures/SoftLayer_Network_Vlan.py b/SoftLayer/fixtures/SoftLayer_Network_Vlan.py
@@ -7,13 +7,13 @@
     'vlanNumber': 4444,
     'firewallInterfaces': None,
     'billingItem': {
-            'allowCancellationFlag': 1,
-            'categoryCode': 'network_vlan',
-            'description': 'Private Network Vlan',
-            'id': 235689,
-            'notes': 'test cli',
-            'orderItemId': 147258,
-        }
+        'allowCancellationFlag': 1,
+        'categoryCode': 'network_vlan',
+        'description': 'Private Network Vlan',
+        'id': 235689,
+        'notes': 'test cli',
+        'orderItemId': 147258,
+    }
 }
 
 editObject = True
diff --git a/SoftLayer/fixtures/SoftLayer_Product_Package.py b/SoftLayer/fixtures/SoftLayer_Product_Package.py
@@ -2137,7 +2137,7 @@
             "recurringFee": "0",
             "setupFee": "0",
             "sort": 10,
-        }]
+    }]
 }, {
     "description": "Public Network Vlan",
     "id": 1071,
@@ -2168,6 +2168,6 @@
             "recurringFee": "0",
             "setupFee": "0",
             "sort": 10,
-        }]
+    }]
 }
 ]
diff --git a/SoftLayer/fixtures/SoftLayer_Software_AccountLicense.py b/SoftLayer/fixtures/SoftLayer_Software_AccountLicense.py
@@ -1,30 +1,30 @@
 getAllObjects = [{
-        "capacity": "4",
-        "key": "ABCDE-6CJ8L-J8R9H-000R0-CDR70",
-        "units": "CPU",
-        "billingItem": {
-            "allowCancellationFlag": 1,
-            "categoryCode": "software_license",
-            "createDate": "2018-10-22T11:16:48-06:00",
-            "cycleStartDate": "2021-06-03T23:11:22-06:00",
-            "description": "vCenter Server Appliance 6.0",
-            "id": 123654789,
-            "lastBillDate": "2021-06-03T23:11:22-06:00",
-            "modifyDate": "2021-06-03T23:11:22-06:00",
-            "nextBillDate": "2021-07-03T23:00:00-06:00",
-            "orderItemId": 385054741,
-            "recurringMonths": 1,
-            "serviceProviderId": 1,
-        },
-        "softwareDescription": {
-            "id": 1529,
-            "longDescription": "VMware vCenter 6.0",
-            "manufacturer": "VMware",
-            "name": "vCenter",
-            "version": "6.0",
-            "requiredUser": "administrator@vsphere.local"
-        }
+    "capacity": "4",
+    "key": "ABCDE-6CJ8L-J8R9H-000R0-CDR70",
+    "units": "CPU",
+    "billingItem": {
+        "allowCancellationFlag": 1,
+        "categoryCode": "software_license",
+        "createDate": "2018-10-22T11:16:48-06:00",
+        "cycleStartDate": "2021-06-03T23:11:22-06:00",
+        "description": "vCenter Server Appliance 6.0",
+        "id": 123654789,
+        "lastBillDate": "2021-06-03T23:11:22-06:00",
+        "modifyDate": "2021-06-03T23:11:22-06:00",
+        "nextBillDate": "2021-07-03T23:00:00-06:00",
+        "orderItemId": 385054741,
+        "recurringMonths": 1,
+        "serviceProviderId": 1,
     },
+    "softwareDescription": {
+        "id": 1529,
+        "longDescription": "VMware vCenter 6.0",
+        "manufacturer": "VMware",
+        "name": "vCenter",
+        "version": "6.0",
+        "requiredUser": "administrator@vsphere.local"
+    }
+},
     {
         "capacity": "1",
         "key": "CBERT-4RL92-K8999-031K4-AJF5J",
@@ -48,4 +48,4 @@
             "name": "Virtual SAN Advanced Tier III",
             "version": "6.2",
         }
-    }]
+}]
diff --git a/SoftLayer/fixtures/SoftLayer_Virtual_Guest.py b/SoftLayer/fixtures/SoftLayer_Virtual_Guest.py
@@ -317,7 +317,7 @@
                     'item': {'description': '2 GB'},
                     'hourlyRecurringFee': '.06',
                     'recurringFee': '42'
-                },
+            },
             'template': {'maxMemory': 2048}
         },
         {
diff --git a/SoftLayer/managers/vs.py b/SoftLayer/managers/vs.py
@@ -1067,8 +1067,8 @@ def upgrade(self, instance_id, cpus=None, memory=None, nic_speed=None, public=Tr
                 category = {'categories': [{
                     'categoryCode': 'guest_disk' + str(disk_number),
                     'complexType': "SoftLayer_Product_Item_Category"}],
-                            'complexType': 'SoftLayer_Product_Item_Price',
-                            'id': price_id}
+                    'complexType': 'SoftLayer_Product_Item_Price',
+                    'id': price_id}
 
                 prices.append(category)
             order['prices'] = prices
diff --git a/SoftLayer/transports/__init__.py b/SoftLayer/transports/__init__.py
@@ -33,13 +33,3 @@
     'FixtureTransport',
     'SoftLayerListResult'
 ]
-
-
-
-
-
-
-
-
-
-
diff --git a/SoftLayer/transports/debug.py b/SoftLayer/transports/debug.py
@@ -58,4 +58,4 @@ def get_last_calls(self):
 
     def print_reproduceable(self, call):
         """Prints a reproduceable debugging output"""
-        return self.transport.print_reproduceable(call)
+        return self.transport.print_reproduceable(call)
diff --git a/SoftLayer/transports/fixture.py b/SoftLayer/transports/fixture.py
@@ -8,6 +8,7 @@
 
 import importlib
 
+
 class FixtureTransport(object):
     """Implements a transport which returns fixtures."""
 
@@ -27,4 +28,4 @@ def __call__(self, call):
 
     def print_reproduceable(self, call):
         """Not Implemented"""
-        return call.service
+        return call.service
diff --git a/SoftLayer/transports/rest.py b/SoftLayer/transports/rest.py
@@ -179,4 +179,4 @@ def print_reproduceable(self, request):
 
         headers = ['"{0}: {1}"'.format(k, v) for k, v in request.transport_headers.items()]
         headers = " -H ".join(headers)
-        return command.format(method=method, headers=headers, data=data, uri=request.url)
+        return command.format(method=method, headers=headers, data=data, uri=request.url)
diff --git a/SoftLayer/transports/soap.py b/SoftLayer/transports/soap.py
@@ -27,6 +27,8 @@
 from .transport import SoftLayerListResult
 
 from pprint import pprint as pp
+
+
 class SoapTransport(object):
     """XML-RPC transport."""
 
@@ -101,8 +103,6 @@ def __call__(self, request):
             # The ** here forces python to treat this dict as properties
             headers.append(xsdFilter(**request.filter))
 
-
-
         if request.identifier:
             initParam = f"{request.service}InitParameters"
             initParamType = client.get_type(f"{{{self.soapNS}}}{initParam}")
@@ -121,7 +121,7 @@ def __call__(self, request):
 
         result = method(_soapheaders=headers)
         # result = client.service.getObject(_soapheaders=headers)
-        
+
         # process_multiref(result['body']['getAllObjectsReturn'])
 
         # print("^^^ RESULT ^^^^^^^")
@@ -142,13 +142,12 @@ def __call__(self, request):
             message = f"Error serializeing response\n{result}\n"
             raise exceptions.TransportError(500, message)
 
-
     def print_reproduceable(self, request):
         """Prints out the minimal python code to reproduce a specific request
 
         The will also automatically replace the API key so its not accidently exposed.
 
         :param request request: Request object
         """
-        
+
         return self.history.last_sent
diff --git a/SoftLayer/transports/transport.py b/SoftLayer/transports/transport.py
@@ -105,6 +105,7 @@ def __repr__(self):
         return "{service}::{method}({params})".format(
             service=self.service, method=self.method, params=param_string)
 
+
 class SoftLayerListResult(list):
     """A SoftLayer API list result."""
 
@@ -115,6 +116,7 @@ def __init__(self, items=None, total_count=0):
         self.total_count = total_count
         super().__init__(items)
 
+
 def _proxies_dict(proxy):
     """Makes a proxy dict appropriate to pass to requests."""
     if not proxy:
diff --git a/SoftLayer/transports/xmlrpc.py b/SoftLayer/transports/xmlrpc.py
@@ -21,6 +21,7 @@
 from .transport import get_session
 from .transport import SoftLayerListResult
 
+
 class XmlRpcTransport(object):
     """XML-RPC transport."""
 
diff --git a/tests/CLI/modules/server_tests.py b/tests/CLI/modules/server_tests.py
@@ -693,19 +693,19 @@ def test_dns_sync_both(self, confirm_mock):
                                            'getResourceRecords')
         getResourceRecords.return_value = []
         createAargs = ({
-                           'type': 'a',
-                           'host': 'hardware-test1',
-                           'domainId': 12345,  # from SoftLayer_Account::getDomains
-                           'data': '172.16.1.100',
-                           'ttl': 7200
-                       },)
+            'type': 'a',
+            'host': 'hardware-test1',
+            'domainId': 12345,  # from SoftLayer_Account::getDomains
+            'data': '172.16.1.100',
+            'ttl': 7200
+        },)
         createPTRargs = ({
-                             'type': 'ptr',
-                             'host': '100',
-                             'domainId': 123456,
-                             'data': 'hardware-test1.test.sftlyr.ws',
-                             'ttl': 7200
-                         },)
+            'type': 'ptr',
+            'host': '100',
+            'domainId': 123456,
+            'data': 'hardware-test1.test.sftlyr.ws',
+            'ttl': 7200
+        },)
 
         result = self.run_command(['hw', 'dns-sync', '1000'])
 
@@ -748,12 +748,12 @@ def test_dns_sync_v6(self, confirm_mock):
             }
         }
         createV6args = ({
-                            'type': 'aaaa',
-                            'host': 'hardware-test1',
-                            'domainId': 12345,  # from SoftLayer_Account::getDomains
-                            'data': '2607:f0d0:1b01:0023:0000:0000:0000:0004',
-                            'ttl': 7200
-                        },)
+            'type': 'aaaa',
+            'host': 'hardware-test1',
+            'domainId': 12345,  # from SoftLayer_Account::getDomains
+            'data': '2607:f0d0:1b01:0023:0000:0000:0000:0004',
+            'ttl': 7200
+        },)
         server.return_value = test_server
         result = self.run_command(['hw', 'dns-sync', '--aaaa-record', '1000'])
         self.assert_no_fail(result)
diff --git a/tests/CLI/modules/vs/vs_tests.py b/tests/CLI/modules/vs/vs_tests.py
@@ -345,19 +345,19 @@ def test_dns_sync_both(self, confirm_mock):
                                            'getResourceRecords')
         getResourceRecords.return_value = []
         createAargs = ({
-                           'type': 'a',
-                           'host': 'vs-test1',
-                           'domainId': 12345,  # from SoftLayer_Account::getDomains
-                           'data': '172.16.240.2',
-                           'ttl': 7200
-                       },)
+            'type': 'a',
+            'host': 'vs-test1',
+            'domainId': 12345,  # from SoftLayer_Account::getDomains
+            'data': '172.16.240.2',
+            'ttl': 7200
+        },)
         createPTRargs = ({
-                             'type': 'ptr',
-                             'host': '2',
-                             'domainId': 123456,
-                             'data': 'vs-test1.test.sftlyr.ws',
-                             'ttl': 7200
-                         },)
+            'type': 'ptr',
+            'host': '2',
+            'domainId': 123456,
+            'data': 'vs-test1.test.sftlyr.ws',
+            'ttl': 7200
+        },)
 
         result = self.run_command(['vs', 'dns-sync', '100'])
 
@@ -400,12 +400,12 @@ def test_dns_sync_v6(self, confirm_mock):
             }
         }
         createV6args = ({
-                            'type': 'aaaa',
-                            'host': 'vs-test1',
-                            'domainId': 12345,
-                            'data': '2607:f0d0:1b01:0023:0000:0000:0000:0004',
-                            'ttl': 7200
-                        },)
+            'type': 'aaaa',
+            'host': 'vs-test1',
+            'domainId': 12345,
+            'data': '2607:f0d0:1b01:0023:0000:0000:0000:0004',
+            'ttl': 7200
+        },)
         guest.return_value = test_guest
         result = self.run_command(['vs', 'dns-sync', '--aaaa-record', '100'])
         self.assert_no_fail(result)
diff --git a/tests/managers/hardware_tests.py b/tests/managers/hardware_tests.py
@@ -557,9 +557,9 @@ def test_edit(self):
         self.assert_called_with('SoftLayer_Hardware_Server',
                                 'editObject',
                                 args=({
-                                     'hostname': 'new-host',
-                                     'domain': 'new.sftlyr.ws',
-                                     'notes': 'random notes',
+                                    'hostname': 'new-host',
+                                    'domain': 'new.sftlyr.ws',
+                                    'notes': 'random notes',
                                 },),
                                 identifier=100)
 
diff --git a/tests/transport_tests.py b/tests/transport_tests.py
@@ -18,7 +18,6 @@
 from SoftLayer import transports
 
 
-
 class TestFixtureTransport(testing.TestCase):
 
     def set_up(self):
diff --git a/tests/transports/rest_tests.py b/tests/transports/rest_tests.py
@@ -17,6 +17,7 @@
 from SoftLayer import testing
 from SoftLayer import transports
 
+
 class TestRestAPICall(testing.TestCase):
 
     def set_up(self):
@@ -362,4 +363,4 @@ def test_complex_encoder_bytes(self):
         result = json.dumps(to_encode, cls=transports.transport.ComplexEncoder)
         # result = '{"test": ["array", 0, 1, false], "bytes": "QVNEQVNEQVNE"}'
         # encode doesn't always encode in the same order, so testing exact match SOMETIMES breaks.
-        self.assertIn("QVNEQVNEQVNE", result)
+        self.assertIn("QVNEQVNEQVNE", result)
diff --git a/tests/transports/soap_tests.py b/tests/transports/soap_tests.py
diff --git a/tests/transports/xmlrpc_tests.py b/tests/transports/xmlrpc_tests.py

Original file line number	Diff line number	Diff line change
`@@ -1173,7 +1173,7 @@`
`1173`	`1173`	`"virtualizationPlatform": 0,`
`1174`	`1174`	`"requiredUser": "administrator@vsphere.local"`
`1175`	`1175`	`}`
`1176`		`- }`
	`1176`	`+}`
`1177`	`1177`	`]`
`1178`	`1178`
`1179`	`1179`	`getActiveVirtualLicenses = [{`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`refreshDuplicate = {`
`240`		`- 'dependentDuplicate': 1`
	`240`	`+ 'dependentDuplicate': 1`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`convertCloneDependentToIndependent = {`
Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@`
`317`	`317`	`'item': {'description': '2 GB'},`
`318`	`318`	`'hourlyRecurringFee': '.06',`
`319`	`319`	`'recurringFee': '42'`
`320`		`- },`
	`320`	`+ },`
`321`	`321`	`'template': {'maxMemory': 2048}`
`322`	`322`	`},`
`323`	`323`	`{`