Backslash continuation removal (Nova folsom-2)

Fixes bug #938588

Backslash continuations removal for scripts in bin/, plugin/, and etc.

Change-Id: Idd17048b6e8db6e939946968e011e68da8585b8d

4 files changed, 35 insertions, 37 deletions

diff --git a/tools/db/schema_diff.py b/tools/db/schema_diff.py
index 7408978e5..873f20543 100755
--- a/tools/db/schema_diff.py
+++ b/tools/db/schema_diff.py
@@ -233,8 +233,8 @@ def main():
     ORIG_DUMP = ORIG_DB + ".dump"
     NEW_DUMP = NEW_DB + ".dump"
 
-    db_type, orig_branch, orig_version, new_branch, new_version =\
-            parse_options()
+    options = parse_options()
+    db_type, orig_branch, orig_version, new_branch, new_version = options
 
     # Since we're going to be switching branches, ensure user doesn't have any
     # uncommited changes
diff --git a/tools/esx/guest_tool.py b/tools/esx/guest_tool.py
index 9cda7e35c..e7b742cc0 100644
--- a/tools/esx/guest_tool.py
+++ b/tools/esx/guest_tool.py
@@ -119,21 +119,20 @@ def _get_windows_network_adapters():
     wbem_service = wbem_locator.ConnectServer('.', 'root\cimv2')
     wbem_network_adapters = wbem_service.InstancesOf('Win32_NetworkAdapter')
     network_adapters = []
-    for wbem_network_adapter in wbem_network_adapters:
-        if wbem_network_adapter.NetConnectionStatus == 2 or \
-                                wbem_network_adapter.NetConnectionStatus == 7:
-            adapter_name = wbem_network_adapter.NetConnectionID
-            mac_address = wbem_network_adapter.MacAddress.lower()
-            wbem_network_adapter_config = \
-                wbem_network_adapter.associators_(
+    for adapter in wbem_network_adapters:
+        if (adapter.NetConnectionStatus == 2 or
+            adapter.NetConnectionStatus == 7):
+            adapter_name = adapter.NetConnectionID
+            mac_address = adapter.MacAddress.lower()
+            config = adapter.associators_(
                           'Win32_NetworkAdapterSetting',
                           'Win32_NetworkAdapterConfiguration')[0]
             ip_address = ''
             subnet_mask = ''
-            if wbem_network_adapter_config.IPEnabled:
-                ip_address = wbem_network_adapter_config.IPAddress[0]
-                subnet_mask = wbem_network_adapter_config.IPSubnet[0]
-                #wbem_network_adapter_config.DefaultIPGateway[0]
+            if config.IPEnabled:
+                ip_address = config.IPAddress[0]
+                subnet_mask = config.IPSubnet[0]
+                #config.DefaultIPGateway[0]
             network_adapters.append({'name': adapter_name,
                                     'mac-address': mac_address,
                                     'ip-address': ip_address,
@@ -160,9 +159,8 @@ def _get_linux_network_adapters():
         sock.fileno(),
         0x8912,
         struct.pack('iL', max_bytes, names.buffer_info()[0])))[0]
-    adapter_names = \
-        [names.tostring()[n_counter:n_counter + offset1].split('\0', 1)[0]
-        for n_counter in xrange(0, outbytes, offset2)]
+    adapter_names = [names.tostring()[n_cnt:n_cnt + offset1].split('\0', 1)[0]
+                     for n_cnt in xrange(0, outbytes, offset2)]
     network_adapters = []
     for adapter_name in adapter_names:
         ip_address = socket.inet_ntoa(fcntl.ioctl(
@@ -257,10 +255,10 @@ def _windows_set_networking():
         cmd = ['"' + vmware_tools_bin + '"', '--cmd', 'machine.id.get']
         for network_detail in _parse_network_details(_execute(cmd,
                                               check_exit_code=False)):
-            mac_address, ip_address, subnet_mask, gateway, broadcast,\
-                dns_servers = network_detail
-            adapter_name, current_ip_address = \
-                    _get_win_adapter_name_and_ip_address(mac_address)
+            (mac_address, ip_address, subnet_mask, gateway, broadcast,
+             dns_servers) = network_detail
+            name_and_ip = _get_win_adapter_name_and_ip_address(mac_address)
+            adapter_name, current_ip_address = name_and_ip
             if adapter_name and not ip_address == current_ip_address:
                 cmd = ['netsh', 'interface', 'ip', 'set', 'address',
                        'name="%s"' % adapter_name, 'source=static', ip_address,
@@ -289,14 +287,14 @@ def _set_rhel_networking(network_details=None):
     network_details = network_details or []
     all_dns_servers = []
     for network_detail in network_details:
-        mac_address, ip_address, subnet_mask, gateway, broadcast,\
-            dns_servers = network_detail
+        (mac_address, ip_address, subnet_mask, gateway, broadcast,
+         dns_servers) = network_detail
         all_dns_servers.extend(dns_servers)
-        adapter_name, current_ip_address = \
-                _get_linux_adapter_name_and_ip_address(mac_address)
+        name_and_ip = _get_linux_adapter_name_and_ip_address(mac_address)
+        adapter_name, current_ip_address = name_and_ip
         if adapter_name and not ip_address == current_ip_address:
-            interface_file_name = \
-                '/etc/sysconfig/network-scripts/ifcfg-%s' % adapter_name
+            interface_file_name = ('/etc/sysconfig/network-scripts/ifcfg-%s' %
+                                   adapter_name)
             # Remove file
             os.remove(interface_file_name)
             # Touch file
@@ -337,11 +335,11 @@ def _set_ubuntu_networking(network_details=None):
     _execute(['touch', interface_file_name])
     interface_file = open(interface_file_name, 'w')
     for device, network_detail in enumerate(network_details):
-        mac_address, ip_address, subnet_mask, gateway, broadcast,\
-            dns_servers = network_detail
+        (mac_address, ip_address, subnet_mask, gateway, broadcast,
+         dns_servers) = network_detail
         all_dns_servers.extend(dns_servers)
-        adapter_name, current_ip_address = \
-                _get_linux_adapter_name_and_ip_address(mac_address)
+        name_and_ip = _get_linux_adapter_name_and_ip_address(mac_address)
+        adapter_name, current_ip_address = name_and_ip
 
         if adapter_name:
             interface_file.write('\nauto %s' % adapter_name)
diff --git a/tools/hacking.py b/tools/hacking.py
index 7fea734b6..93e51e66c 100755
--- a/tools/hacking.py
+++ b/tools/hacking.py
@@ -48,8 +48,8 @@ VERBOSE_MISSING_IMPORT = False
 
 
 def is_import_exception(mod):
-    return mod in IMPORT_EXCEPTIONS or \
-        any(mod.startswith(m + '.') for m in IMPORT_EXCEPTIONS)
+    return (mod in IMPORT_EXCEPTIONS or
+            any(mod.startswith(m + '.') for m in IMPORT_EXCEPTIONS))
 
 
 def import_normalize(line):
@@ -114,9 +114,9 @@ def nova_one_import_per_line(logical_line):
     """
     pos = logical_line.find(',')
     parts = logical_line.split()
-    if pos > -1 and (parts[0] == "import" or
-       parts[0] == "from" and parts[2] == "import") and \
-       not is_import_exception(parts[1]):
+    if (pos > -1 and (parts[0] == "import" or
+                      parts[0] == "from" and parts[2] == "import") and
+        not is_import_exception(parts[1])):
         return pos, "NOVA N301: one import per line"
 
 _missingImport = set([])
diff --git a/tools/install_venv.py b/tools/install_venv.py
index ffc5417e8..8594da978 100644
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -143,8 +143,8 @@ class Fedora(Distro):
 
 
 def get_distro():
-    if os.path.exists('/etc/fedora-release') or \
-       os.path.exists('/etc/redhat-release'):
+    if (os.path.exists('/etc/fedora-release') or
+        os.path.exists('/etc/redhat-release')):
         return Fedora()
     else:
         return Distro()