Skip to content

Commit ef3b524

Browse files
CrackerJackMackCrackerJackMack
committed
Merge pull request softlayer#126 from sudorandom/master
Flake8 Fixes
2 parents 18e476f + e97fb09 commit ef3b524

8 files changed

Lines changed: 39 additions & 33 deletions

File tree

‎SoftLayer/CLI/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
"""
99

1010

11-
import SoftLayer.CLI.core
12-
from SoftLayer.CLI.helpers import *
11+
import SoftLayer.CLI.core # NOQA
12+
from SoftLayer.CLI.helpers import * # NOQA

‎SoftLayer/CLI/modules/bmetal.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,9 @@ def _generate_windows_code(description):
267267

268268
class CreateBMetalInstance(CLIRunnable):
269269
"""
270-
usage: sl bmetal create --hostname=HOST --domain=DOMAIN --cpu=CPU --disk=DISK...
271-
--memory=MEMORY --os=OS (--hourly | --monthly) [options]
270+
usage: sl bmetal create --hostname=HOST --domain=DOMAIN --cpu=CPU --os=OS
271+
--memory=MEMORY --disk=DISK... (--hourly | --monthly)
272+
[options]
272273
273274
Order/create a bare metal instance. See 'sl bmetal create-options' for valid
274275
options

‎SoftLayer/CLI/modules/cci.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ def execute(client, args):
102102
mb_to_gb(guest['maxMemory']),
103103
guest['primaryIpAddress'] or blank(),
104104
guest['primaryBackendIpAddress'] or blank(),
105-
guest['activeTransaction']['transactionStatus'].get('friendlyName') or blank(),
105+
guest['activeTransaction']['transactionStatus'].get(
106+
'friendlyName') or blank(),
106107
])
107108

108109
return t

‎SoftLayer/CLI/modules/hardware.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,8 @@ class HardwareCreateOptions(CLIRunnable):
337337
"""
338338

339339
action = 'create-options'
340-
options = ['datacenter', 'cpu', 'memory', 'os', 'disk', 'nic', 'controller']
340+
options = ['datacenter', 'cpu', 'memory', 'os', 'disk', 'nic',
341+
'controller']
341342

342343
@classmethod
343344
def execute(cls, client, args):
@@ -585,7 +586,7 @@ def _generate_windows_code(description):
585586

586587
class CreateHardware(CLIRunnable):
587588
"""
588-
usage: sl hardware create --hostname=HOST --domain=DOMAIN --cpu=CPU
589+
usage: sl hardware create --hostname=HOST --domain=DOMAIN --cpu=CPU
589590
--chassis=CHASSIS --memory=MEMORY --os=OS --disk=SIZE... [options]
590591
591592
Order/create a dedicated server. See 'sl hardware list-chassis' and
@@ -651,7 +652,7 @@ def execute(cls, client, args):
651652
disk_prices.append(cls._get_default_value(ds_options, 'disk0'))
652653

653654
order['disks'] = disk_prices
654-
655+
655656
# Set the disk controller price
656657
if args.get('--controller'):
657658
dc_price = cls._get_price_id_from_options(ds_options,
@@ -723,7 +724,7 @@ def execute(cls, client, args):
723724
def _get_default_value(cls, ds_options, option):
724725
if option not in ds_options['categories']:
725726
return
726-
727+
727728
for item in ds_options['categories'][option]['items']:
728729
if not any([
729730
float(item['prices'][0].get('setupFee', 0)),

‎SoftLayer/CLI/modules/nas.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,15 @@ def execute(client, args):
3131
mask='eventCount,serviceResource[datacenter.name]')
3232
nas = [NestedDict(n) for n in nas]
3333

34-
t = Table(['id', 'datacenter', 'size', 'username',
35-
'password', 'server'])
34+
t = Table(['id', 'datacenter', 'size', 'username', 'password',
35+
'server'])
3636

3737
for n in nas:
3838
t.add_row([
3939
n['id'],
4040
n['serviceResource']['datacenter'].get('name', blank()),
41-
FormattedItem(n.get('capacityGb', blank()),
41+
FormattedItem(
42+
n.get('capacityGb', blank()),
4243
"%dGB" % n.get('capacityGb', 0)),
4344
n.get('username', blank()),
4445
n.get('password', blank()),

‎SoftLayer/managers/hardware.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -440,10 +440,10 @@ def get_default_value(package_options, category):
440440

441441
for item in package_options['categories'][category]['items']:
442442
if not any([
443-
float(item['prices'][0].get('setupFee', 0)),
444-
float(item['prices'][0].get('recurringFee', 0)),
445-
float(item['prices'][0].get('hourlyRecurringFee', 0)),
446-
float(item['prices'][0].get('oneTimeFee', 0)),
447-
float(item['prices'][0].get('laborFee', 0)),
443+
float(item['prices'][0].get('setupFee', 0)),
444+
float(item['prices'][0].get('recurringFee', 0)),
445+
float(item['prices'][0].get('hourlyRecurringFee', 0)),
446+
float(item['prices'][0].get('oneTimeFee', 0)),
447+
float(item['prices'][0].get('laborFee', 0)),
448448
]):
449449
return item['price_id']

‎SoftLayer/tests/managers/dns_tests.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,15 @@ def test_resolve_zone_name(self):
6666
res = self.dns_client._get_zone_id_from_name('example.com')
6767
self.assertEqual([12345], res)
6868
self.client['Account'].getDomains.assert_called_once_with(
69-
filter={"domains": {"name": {"operation": "_= example.com"}}})
69+
filter={"domains": {"name": {"operation": "_= example.com"}}})
7070

7171
# no matches
7272
self.client['Account'].getDomains.reset_mock()
7373
self.client['Account'].getDomains.return_value = []
7474
res = self.dns_client._get_zone_id_from_name('example.com')
7575
self.assertEqual([], res)
7676
self.client['Account'].getDomains.assert_called_once_with(
77-
filter={"domains": {"name": {"operation": "_= example.com"}}})
77+
filter={"domains": {"name": {"operation": "_= example.com"}}})
7878

7979
def test_create_zone(self):
8080
call = self.client['Dns_Domain'].createObject
@@ -150,30 +150,30 @@ def test_get_record(self):
150150
D.return_value = [records[1]]
151151
self.dns_client.get_records(12345, type='a')
152152
D.assert_called_once_with(
153-
id=12345,
154-
filter={'resourceRecords': {'type': {"operation": "_= a"}}},
155-
mask=ANY)
153+
id=12345,
154+
filter={'resourceRecords': {'type': {"operation": "_= a"}}},
155+
mask=ANY)
156156

157157
D.reset_mock()
158158
D.return_value = [records[0]]
159159
self.dns_client.get_records(12345, host='a')
160160
D.assert_called_once_with(
161-
id=12345,
162-
filter={'resourceRecords': {'host': {"operation": "_= a"}}},
163-
mask=ANY)
161+
id=12345,
162+
filter={'resourceRecords': {'host': {"operation": "_= a"}}},
163+
mask=ANY)
164164

165165
D.reset_mock()
166166
D.return_value = records[3:5]
167167
self.dns_client.get_records(12345, data='a')
168168
D.assert_called_once_with(
169-
id=12345,
170-
filter={'resourceRecords': {'data': {"operation": "_= a"}}},
171-
mask=ANY)
169+
id=12345,
170+
filter={'resourceRecords': {'data': {"operation": "_= a"}}},
171+
mask=ANY)
172172

173173
D.reset_mock()
174174
D.return_value = records[3:5]
175175
self.dns_client.get_records(12345, ttl='86400')
176176
D.assert_called_once_with(
177-
id=12345,
178-
filter={'resourceRecords': {'ttl': {"operation": 86400}}},
179-
mask=ANY)
177+
id=12345,
178+
filter={'resourceRecords': {'ttl': {"operation": 86400}}},
179+
mask=ANY)

‎SoftLayer/tests/transport_tests.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ class TestRestAPICall(unittest.TestCase):
6161
@patch('SoftLayer.transport.requests.request')
6262
def test_json(self, request):
6363
request().content = '{}'
64-
resp = make_rest_api_call('GET', 'http://something.com/path/to/resource.json')
64+
resp = make_rest_api_call(
65+
'GET', 'http://something.com/path/to/resource.json')
6566
self.assertEqual(resp, {})
6667
request.assert_called_with(
6768
'GET', 'http://something.com/path/to/resource.json',
@@ -87,7 +88,8 @@ def test_json(self, request):
8788
@patch('SoftLayer.transport.requests.request')
8889
def test_text(self, request):
8990
request().text = 'content'
90-
resp = make_rest_api_call('GET', 'http://something.com/path/to/resource.txt')
91+
resp = make_rest_api_call(
92+
'GET', 'http://something.com/path/to/resource.txt')
9193
self.assertEqual(resp, 'content')
9294
request.assert_called_with(
9395
'GET', 'http://something.com/path/to/resource.txt',

0 commit comments

Comments
 (0)