Fixes for new lint error

sudorandom · sudorandom · commit e9878e6167cf · 2015-03-06T11:15:58.000-06:00
The new error is W503 (line break before binary operator)
diff --git a/SoftLayer/API.py b/SoftLayer/API.py
@@ -72,8 +72,8 @@ def __init__(self, username=None, api_key=None, endpoint_url=None,
                                               config_file=config_file)
         self.auth = settings.get('auth')
 
-        self.endpoint_url = (settings.get('endpoint_url')
-                             or API_PUBLIC_ENDPOINT).rstrip('/')
+        self.endpoint_url = (settings.get('endpoint_url') or
+                             API_PUBLIC_ENDPOINT).rstrip('/')
         self.transport = transport or transports.XmlRpcTransport()
 
         self.timeout = None
diff --git a/SoftLayer/CLI/config/setup.py b/SoftLayer/CLI/config/setup.py
@@ -100,8 +100,8 @@ def get_user_input(env):
 
     # Ask for username
     for _ in range(3):
-        username = (env.input('Username [%s]: ' % defaults['username'])
-                    or defaults['username'])
+        username = (env.input('Username [%s]: ' % defaults['username']) or
+                    defaults['username'])
         if username:
             break
     else:
@@ -110,8 +110,8 @@ def get_user_input(env):
     # Ask for 'secret' which can be api_key or their password
     for _ in range(3):
         secret = (env.getpass('API Key or Password [%s]: '
-                              % defaults['api_key'])
-                  or defaults['api_key'])
+                              % defaults['api_key']) or
+                  defaults['api_key'])
         if secret:
             break
     else:
diff --git a/SoftLayer/CLI/virt/detail.py b/SoftLayer/CLI/virt/detail.py
@@ -62,8 +62,7 @@ def cli(self, identifier, passwords=False, price=False):
     table.add_row(['public_ip',
                    result['primaryIpAddress'] or formatting.blank()])
     table.add_row(['private_ip',
-                   result['primaryBackendIpAddress']
-                   or formatting.blank()])
+                   result['primaryBackendIpAddress'] or formatting.blank()])
     table.add_row(['private_only', result['privateNetworkOnlyFlag']])
     table.add_row(['private_cpu', result['dedicatedAccountHostOnlyFlag']])
     table.add_row(['created', result['createDate']])
diff --git a/SoftLayer/transports.py b/SoftLayer/transports.py
@@ -257,8 +257,8 @@ def _format_object_mask(objectmask, service):
         mheader = 'SoftLayer_ObjectMask'
 
         objectmask = objectmask.strip()
-        if (not objectmask.startswith('mask')
-                and not objectmask.startswith('[')):
+        if (not objectmask.startswith('mask') and
+                not objectmask.startswith('[')):
             objectmask = "mask[%s]" % objectmask
 
     return {mheader: {'mask': objectmask}}
