lib: pycodestyle fixes

Author: Alec Leamas

ddupdate-config

@@ -14,6 +14,6 @@ sys.path.insert(0, os.path.join(HERE, 'lib'))
 try:
     from lib.ddupdate import config
 except (ImportError, ModuleNotFoundError):
-    from  ddupdate import config
+    from ddupdate import config
 
 config.main()

lib/ddupdate/config.py

@@ -24,6 +24,7 @@
 # address-options = foo bar
 """
 
+
 class _GoodbyeError(Exception):
     """General error, implies sys.exit()."""
 
@@ -82,10 +83,12 @@ def _load_addressers(log, paths):
     """Load address plugins from paths into dict keyed by name."""
     return _load_plugins(log, paths, AddressPlugin)
 
+
 def _load_auth_plugins(log, paths):
     """Load auth plugins from paths into dict keyed by name."""
     return _load_plugins(log, paths, AuthPlugin)
 
+
 def get_service_plugin(service_plugins):
     """
     Present a menu with all plugins to user, let her select.
@@ -113,6 +116,7 @@ def get_service_plugin(service_plugins):
         raise _GoodbyeError("Illegal selection\n", 2)
     return services_by_ix[ix]
 
+
 def get_auth_plugin(plugins):
     """
     Present a menu with all auth plugins to user, let her select.
@@ -142,7 +146,6 @@ def get_auth_plugin(plugins):
     return plugins_by_ix[ix]
 
 
-
 def get_address_plugin(log, paths):
     """
     Let user select address plugin.
@@ -206,13 +209,13 @@ def copy_systemd_units():
     with open(os.path.join(user_dir, 'ddupdate.service')) as f:
         lines = f.readlines()
     output = []
-    for l in lines:
-        if l.startswith('ExecStart'):
+    for line in lines:
+        if line.startswith('ExecStart'):
             output.append("ExecStart=" + bindir + "/ddupdate")
         else:
-            output.append(l)
-    with open(os.path.join(user_dir, 'ddupdate.service'), 'w')  as f:
-        f.write('\n'.join([l.strip() for l in output]))
+            output.append(line)
+    with open(os.path.join(user_dir, 'ddupdate.service'), 'w') as f:
+        f.write(['\n'.join(elem.strip()) for elem in output])
 
 
 def get_netrc(service):
@@ -295,6 +298,7 @@ def write_config_files(config):
     os.unlink(tmp_conf)
     print("Patched config file: " + dest)
 
+
 def write_credentials(auth_plugin, hostname, netrc):
     """ Update credentials at auth_plugin with data from netrc. """
     username = None
@@ -313,14 +317,15 @@ def write_credentials(auth_plugin, hostname, netrc):
     auth_plugin.set_password(hostname, username, password)
     print("Updated password for user %s at %s" % (username, hostname))
 
+
 def try_start_service():
     """Start dduppdate systemd user service and display logs."""
     print("Starting service and displaying logs")
     cmd = 'systemctl --user daemon-reload'
     cmd += ';systemctl --user start ddupdate.service'
     cmd += ';journalctl -l --user --since -60s -u ddupdate.service'
     cmd = ['sh', '-c', cmd]
-    subprocess.run(cmd, check = True)
+    subprocess.run(cmd, check=True)
     print('Use "journalctl --user -u ddupdate.service" to display logs.')
 
 
@@ -332,12 +337,12 @@ def enable_service():
         cmd = 'systemctl --user start ddupdate.timer'
         cmd += ';systemctl --user enable ddupdate.timer'
         print("\nStarting and enabling ddupdate.timer")
-        subprocess.run(['sh', '-c', cmd], check = True)
+        subprocess.run(['sh', '-c', cmd], check=True)
     else:
         cmd = 'systemctl --user stop ddupdate.timer'
         cmd += 'systemctl --user disable ddupdate.timer'
         print("Stopping ddupdate.timer")
-        subprocess.run(['sh', '-c', cmd], check = True)
+        subprocess.run(['sh', '-c', cmd], check=True)
         msg = "systemctl --user start ddupdate.timer"
         msg += "; systemctl --user enable ddupdate.timer"
         print('\nStart ddupdate using "%s"' % msg)

lib/ddupdate/ddplugin.py

@@ -43,6 +43,7 @@ def get_auth_plugin():
 
 # pylint: disable=duplicate-code
 
+
 def http_basic_auth_setup(url, host=None):
     """
     Configure urllib to provide basic authentication.
@@ -108,13 +109,13 @@ def get_response(log, url, **kwargs):
         log.debug("Posting data: " + data.decode('ascii'))
     try:
         request = urllib.request.Request(url)
-        if 'header' in  kwargs:
+        if 'header' in kwargs:
             request.add_header(*kwargs['header'])
         with urllib.request.urlopen(request, data, timeout=to) as response:
             code = response.getcode()
             html = response.read().decode('ascii')
     except timeoutError:
-        raise ServiceError("Timeout reading %s" % url)  from None
+        raise ServiceError("Timeout reading %s" % url) from None
     except (urllib.error.HTTPError, urllib.error.URLError) as err:
         raise ServiceError("Error reading %s :%s" % (url, err)) from err
     log.debug("Got response (%d) : %s", code, html)
@@ -179,7 +180,7 @@ def parse_ifconfig_output(self, text):
 
         """
         for line in text.split('\n'):
-            words = [ word for word in line.split(' ') if word != '' ]
+            words = [word for word in line.split(' ') if word != '']
             if words[0] == 'inet':
                 # use existing logic
                 self.v4 = words[1].split('/')[0]
@@ -189,7 +190,7 @@ def parse_ifconfig_output(self, text):
                     continue
                 addr = words[1].split('/')[0]
                 words = set(words[2:])
-                if ('link' in words) or ('0x20<link>' in words) :
+                if ('link' in words) or ('0x20<link>' in words):
                     # don't use a link-local address
                     continue
                 if 'deprecated' in words:
@@ -224,6 +225,7 @@ def __str__(self):
 class ServiceError(AddressError):
     """General error in ServicePlugin."""
 
+
 class AuthError(AddressError):
     """General error in AuthPlugin."""
 

lib/ddupdate/main.py

@@ -22,7 +22,6 @@
 from ddupdate.ddplugin import set_auth_plugin, get_auth_plugin
 
 
-
 if 'XDG_CACHE_HOME' in os.environ:
     CACHE_DIR = os.environ['XDG_CACHE_HOME']
 else:
@@ -139,13 +138,14 @@ def parse_conffile(log):
 def parse_config(config, section):
     """Return dict with values from config backed by DEFAULTS"""
     results = {}
-    if not section in config:
+    if section not in config:
         raise _GoodbyeError("No such section: " + section, 2)
     items = config[section]
-    for key, value  in DEFAULTS.items():
+    for key, value in DEFAULTS.items():
         results[key] = items[key] if key in items else value
     return results
 
+
 def get_config(log):
     """ Parse config file, return a (ConfigParser, list of sections) tuple."""
     path = parse_conffile(log)
@@ -229,7 +229,7 @@ def get_parser(conf):
         help='List configuration file sections. ',
         default=False, action='store_true')
     others.add_argument(
-        "-e", "--execute-section",  metavar="section",
+        "-e", "--execute-section", metavar="section",
         help='Update a given configuration file section [all sections]',
         dest='execute_section', default='')
     others.add_argument(
@@ -387,6 +387,7 @@ def set_password(opts):
     auth_plugin = get_auth_plugin()
     auth_plugin.set_password(*opts.set_password)
 
+
 def filter_ip(ip_version, ip):
     """Filter the ip address to match the --ip-version option."""
     if ip_version == 'v4':
@@ -472,7 +473,7 @@ def get_ip(ip_plugin, opts, log):
         ip = ip_plugin.get_ip(log, opts.address_options)
     except AddressError as err:
         raise _SectionFailError("Cannot obtain ip address: " + str(err)) \
-                from err
+            from err
     if not ip or ip.empty():
         log.info("Using ip address provided by update service")
         ip = None
@@ -516,7 +517,7 @@ def main():
                 ip = get_ip(ip_plugin, opts, log)
                 check_ip_cache(ip, service_plugin, opts, log)
                 service_plugin.register(
-                        log, opts.hostname, ip, opts.service_options)
+                    log, opts.hostname, ip, opts.service_options)
                 ip_cache_set(opts, ip)
                 log.info("Update OK")
             except _SectionFailError:

lib/ddupdate/netrc_to_keyring.py

@@ -6,6 +6,7 @@
 
 import keyring
 
+
 def main():
     """ Indeed: main function. """
     _netrc = netrc.netrc()
@@ -15,5 +16,6 @@ def main():
         credentials = "{0}\t{1}".format((login or 'api_key'), password)
         keyring.set_password('ddupdate', host, credentials)
 
+
 if __name__ == '__main__':
     main()

setup.py

@@ -1,6 +1,7 @@
 """ddupdate install data."""
 
-# pylint: disable=bad-option-value, import-outside-toplevel, consider-using-with
+# pylint: disable=bad-option-value, import-outside-toplevel
+# pylint: disable=consider-using-with
 
 import shutil
 import os
@@ -22,7 +23,7 @@ def systemd_unitdir():
     try:
         return subprocess.check_output(cmd).decode().strip()
     except (OSError, subprocess.CalledProcessError):
-        return  "/usr/lib/systemd/user"
+        return "/usr/lib/systemd/user"
 
 
 DATA = [
@@ -46,12 +47,13 @@ def run(self):
             if os.path.exists(path):
                 shutil.rmtree(path)
 
+
 class _ProjectInstall(install):
     """Log used installation paths."""
 
     def run(self):
         final_prefix = None
-        if 'FINAL_PREFIX' in  os.environ:
+        if 'FINAL_PREFIX' in os.environ:
             final_prefix = os.environ['FINAL_PREFIX']
         if final_prefix:
             # Strip leading prefix in paths like /usr/lib/systemd,
@@ -87,6 +89,7 @@ def run(self):
             f.write("[install]\n")
             f.write(s)
 
+
 setup(
     name='ddupdate',
     version='0.7.0',