lint: fix whitespace issues in various modules
BUG=chromium:431514
TEST=no more lint errors
TEST=./cbuildbot/run_tests passes
Change-Id: I1c57d6fe903f68510599390acfc1b38df7005fa4
Reviewed-on: https://chromium-review.googlesource.com/232020
Reviewed-by: Gabe Black <gabeblack@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
diff --git a/scripts/cros_sdk.py b/scripts/cros_sdk.py
index 3d36cfd..0a92c4e 100644
--- a/scripts/cros_sdk.py
+++ b/scripts/cros_sdk.py
@@ -4,9 +4,6 @@
"""This script fetches and prepares an SDK chroot."""
-# pylint: disable=bad-continuation
-# pylint: disable=bad-whitespace
-
from __future__ import print_function
import glob
@@ -98,16 +95,16 @@
content_length = 0
print('Attempting download: %s' % url)
result = retry_util.RunCurl(
- ['-I', url], redirect_stdout=True, redirect_stderr=True,
- print_cmd=False)
+ ['-I', url], redirect_stdout=True, redirect_stderr=True,
+ print_cmd=False)
successful = False
for header in result.output.splitlines():
# We must walk the output to find the string '200 OK' for use cases where
# a proxy is involved and may have pushed down the actual header.
if header.find('200 OK') != -1:
successful = True
- elif header.lower().startswith("content-length:"):
- content_length = int(header.split(":", 1)[-1].strip())
+ elif header.lower().startswith('content-length:'):
+ content_length = int(header.split(':', 1)[-1].strip())
if successful:
break
if successful:
@@ -272,7 +269,7 @@
apache_module_path = None
raise SystemExit(
'Could not find apache module path containing all required modules: %s'
- % ', '.join(so for mod, so in apache_modules))
+ % ', '.join(so for mod, so in apache_modules))
def check_add_module(name):
so = 'mod_%s.so' % name
@@ -317,11 +314,11 @@
# Set up child side of the network.
commands = (
- ('ip', 'link', 'set', 'up', 'lo'),
- ('ip', 'address', 'add',
- '%s/%u' % (PROXY_GUEST_IP, PROXY_NETMASK),
- 'dev', veth_guest),
- ('ip', 'link', 'set', veth_guest, 'up'),
+ ('ip', 'link', 'set', 'up', 'lo'),
+ ('ip', 'address', 'add',
+ '%s/%u' % (PROXY_GUEST_IP, PROXY_NETMASK),
+ 'dev', veth_guest),
+ ('ip', 'link', 'set', veth_guest, 'up'),
)
try:
for cmd in commands:
@@ -363,28 +360,28 @@
log_file = os.path.join(chroot_parent, '.%s-apache-proxy.log' % chroot_base)
apache_directives = [
- 'User #%u' % uid,
- 'Group #%u' % gid,
- 'PidFile %s' % pid_file,
- 'ErrorLog %s' % log_file,
- 'Listen %s:%u' % (PROXY_HOST_IP, PROXY_PORT),
- 'ServerName %s' % PROXY_HOST_IP,
- 'ProxyRequests On',
- 'AllowCONNECT %s' % ' '.join(map(str, PROXY_CONNECT_PORTS)),
+ 'User #%u' % uid,
+ 'Group #%u' % gid,
+ 'PidFile %s' % pid_file,
+ 'ErrorLog %s' % log_file,
+ 'Listen %s:%u' % (PROXY_HOST_IP, PROXY_PORT),
+ 'ServerName %s' % PROXY_HOST_IP,
+ 'ProxyRequests On',
+ 'AllowCONNECT %s' % ' '.join(map(str, PROXY_CONNECT_PORTS)),
] + [
- 'LoadModule %s %s' % (mod, os.path.join(apache_module_path, so))
- for (mod, so) in apache_modules
+ 'LoadModule %s %s' % (mod, os.path.join(apache_module_path, so))
+ for (mod, so) in apache_modules
]
commands = (
- ('ip', 'link', 'add', 'name', veth_host,
- 'type', 'veth', 'peer', 'name', veth_guest),
- ('ip', 'address', 'add',
- '%s/%u' % (PROXY_HOST_IP, PROXY_NETMASK),
- 'dev', veth_host),
- ('ip', 'link', 'set', veth_host, 'up'),
- [apache_bin, '-f', '/dev/null']
- + [arg for d in apache_directives for arg in ('-C', d)],
- ('ip', 'link', 'set', veth_guest, 'netns', str(pid)),
+ ('ip', 'link', 'add', 'name', veth_host,
+ 'type', 'veth', 'peer', 'name', veth_guest),
+ ('ip', 'address', 'add',
+ '%s/%u' % (PROXY_HOST_IP, PROXY_NETMASK),
+ 'dev', veth_host),
+ ('ip', 'link', 'set', veth_host, 'up'),
+ ([apache_bin, '-f', '/dev/null'] +
+ [arg for d in apache_directives for arg in ('-C', d)]),
+ ('ip', 'link', 'set', veth_guest, 'netns', str(pid)),
)
cmd = None # Make cros lint happy.
try:
@@ -450,9 +447,9 @@
help=('''Use sdk tarball located at this url.
Use file:// for local files.'''))
parser.add_option('--sdk-version', default=None,
- help='Use this sdk version. For prebuilt, current is %r'
- ', for bootstrapping it is %r.'
- % (sdk_latest_version, bootstrap_latest_version))
+ help=('Use this sdk version. For prebuilt, current is %r'
+ ', for bootstrapping it is %r.'
+ % (sdk_latest_version, bootstrap_latest_version)))
# Commands.
group = parser.add_option_group('Commands')
@@ -460,7 +457,7 @@
'--enter', action='store_true', default=False,
help='Enter the SDK chroot. Implies --create.')
group.add_option(
- '--create', action='store_true',default=False,
+ '--create', action='store_true', default=False,
help='Create the chroot only if it does not already exist. '
'Implies --download.')
group.add_option(