Skip to content

Commit f3bd426

Browse files
author
Joshua Powers
authored
test: fix all flake8 E126 errors (canonical#425)
1 parent f083050 commit f3bd426

File tree

21 files changed

+238
-153
lines changed

21 files changed

+238
-153
lines changed

‎cloudinit/cmd/devel/render.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@ def handle_args(name, args):
5757
paths.run_dir, INSTANCE_JSON_SENSITIVE_FILE)
5858
if not os.path.exists(instance_data_fn):
5959
LOG.warning(
60-
'Missing root-readable %s. Using redacted %s instead.',
61-
instance_data_fn, redacted_data_fn)
60+
'Missing root-readable %s. Using redacted %s instead.',
61+
instance_data_fn, redacted_data_fn
62+
)
6263
instance_data_fn = redacted_data_fn
6364
else:
6465
instance_data_fn = redacted_data_fn

‎cloudinit/cmd/query.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,9 @@ def handle_args(name, args):
9090
instance_data_fn = sensitive_data_fn
9191
else:
9292
LOG.warning(
93-
'Missing root-readable %s. Using redacted %s instead.',
94-
sensitive_data_fn, redacted_data_fn)
93+
'Missing root-readable %s. Using redacted %s instead.',
94+
sensitive_data_fn, redacted_data_fn
95+
)
9596
instance_data_fn = redacted_data_fn
9697
else:
9798
instance_data_fn = redacted_data_fn

‎cloudinit/distros/netbsd.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,9 @@ def set_passwd(self, user, passwd, hashed=False):
100100
else:
101101
method = crypt.METHOD_BLOWFISH # pylint: disable=E1101
102102
hashed_pw = crypt.crypt(
103-
passwd,
104-
crypt.mksalt(method))
103+
passwd,
104+
crypt.mksalt(method)
105+
)
105106

106107
try:
107108
subp.subp(['usermod', '-p', hashed_pw, user])
@@ -143,8 +144,9 @@ def _get_pkg_cmd_environ(self):
143144
os_arch = platform.machine()
144145
e = os.environ.copy()
145146
e['PKG_PATH'] = (
146-
'http://cdn.netbsd.org/pub/pkgsrc/'
147-
'packages/NetBSD/%s/%s/All') % (os_arch, os_release)
147+
'http://cdn.netbsd.org/pub/pkgsrc/'
148+
'packages/NetBSD/%s/%s/All'
149+
) % (os_arch, os_release)
148150
return e
149151

150152
def update_package_sources(self):

‎cloudinit/distros/openbsd.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,10 @@ def _get_pkg_cmd_environ(self):
4242
os_arch = platform.machine()
4343
e = os.environ.copy()
4444
e['PKG_PATH'] = (
45-
'ftp://ftp.openbsd.org/pub/OpenBSD/{os_release}/'
46-
'packages/{os_arch}/').format(
47-
os_arch=os_arch, os_release=os_release)
45+
'ftp://ftp.openbsd.org/pub/OpenBSD/{os_release}/'
46+
'packages/{os_arch}/').format(
47+
os_arch=os_arch, os_release=os_release
48+
)
4849
return e
4950

5051

‎cloudinit/net/__init__.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -849,8 +849,9 @@ def find_mac(flat_list):
849849
def get_interfaces_by_mac_on_netbsd():
850850
ret = {}
851851
re_field_match = (
852-
r"(?P<ifname>\w+).*address:\s"
853-
r"(?P<mac>([\da-f]{2}[:-]){5}([\da-f]{2})).*")
852+
r"(?P<ifname>\w+).*address:\s"
853+
r"(?P<mac>([\da-f]{2}[:-]){5}([\da-f]{2})).*"
854+
)
854855
(out, _) = subp.subp(['ifconfig', '-a'])
855856
if_lines = re.sub(r'\n\s+', ' ', out).splitlines()
856857
for line in if_lines:

‎cloudinit/net/bsd.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,9 @@ def _ifconfig_entries(self, settings, target=None):
6666
if subnet.get('type') == 'static':
6767
if not subnet.get('netmask'):
6868
LOG.debug(
69-
'Skipping IP %s, because there is no netmask',
70-
subnet.get('address'))
69+
'Skipping IP %s, because there is no netmask',
70+
subnet.get('address')
71+
)
7172
continue
7273
LOG.debug('Configuring dev %s with %s / %s', device_name,
7374
subnet.get('address'), subnet.get('netmask'))

‎cloudinit/net/netbsd.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ def write_config(self):
1717
if self.dhcp_interfaces():
1818
self.set_rc_config_value('dhcpcd', 'YES')
1919
self.set_rc_config_value(
20-
'dhcpcd_flags',
21-
' '.join(self.dhcp_interfaces()))
20+
'dhcpcd_flags',
21+
' '.join(self.dhcp_interfaces())
22+
)
2223
for device_name, v in self.interface_configurations.items():
2324
if isinstance(v, dict):
2425
self.set_rc_config_value(

‎cloudinit/net/openbsd.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ def write_config(self):
1919
elif isinstance(v, dict):
2020
try:
2121
content = "inet {address} {netmask}\n".format(
22-
address=v['address'],
23-
netmask=v['netmask'])
22+
address=v['address'],
23+
netmask=v['netmask']
24+
)
2425
except KeyError:
2526
LOG.error(
2627
"Invalid static configuration for %s",

‎cloudinit/net/sysconfig.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ def _render_subnets(cls, iface_cfg, subnets, has_default_route, flavor):
505505
iface_cfg['IPADDR6_%d' % ipv6_index] = ipv6_cidr
506506
else:
507507
iface_cfg['IPV6ADDR_SECONDARIES'] += \
508-
" " + ipv6_cidr
508+
" " + ipv6_cidr
509509
else:
510510
ipv4_index = ipv4_index + 1
511511
suff = "" if ipv4_index == 0 else str(ipv4_index)

‎cloudinit/reporting/handlers.py‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ def __init__(self,
139139
self.event_key_prefix = u"{0}|{1}".format(self.EVENT_PREFIX,
140140
self.incarnation_no)
141141
self.publish_thread = threading.Thread(
142-
target=self._publish_event_routine)
142+
target=self._publish_event_routine
143+
)
143144
self.publish_thread.daemon = True
144145
self.publish_thread.start()
145146

@@ -202,10 +203,15 @@ def _event_key(self, event):
202203
uuid.uuid4())
203204

204205
def _encode_kvp_item(self, key, value):
205-
data = (struct.pack("%ds%ds" % (
206+
data = struct.pack(
207+
"%ds%ds"
208+
% (
206209
self.HV_KVP_EXCHANGE_MAX_KEY_SIZE,
207-
self.HV_KVP_EXCHANGE_MAX_VALUE_SIZE),
208-
key.encode('utf-8'), value.encode('utf-8')))
210+
self.HV_KVP_EXCHANGE_MAX_VALUE_SIZE,
211+
),
212+
key.encode("utf-8"),
213+
value.encode("utf-8"),
214+
)
209215
return data
210216

211217
def _decode_kvp_item(self, record_data):

0 commit comments

Comments
 (0)