flake8 fixes.

Author: rouilj

roundup/admin.py

@@ -23,7 +23,14 @@
 
 __docformat__ = 'restructuredtext'
 
-import csv, getopt, getpass, operator, os, re, shutil, sys
+import csv
+import getopt
+import getpass
+import operator
+import os
+import re
+import shutil
+import sys
 
 from roundup import date, hyperdb, init, password, token
 from roundup import __version__ as roundup_version
@@ -157,10 +164,12 @@ def help_commands(self):
         commands.sort()
         commands.append(_(
 """Commands may be abbreviated as long as the abbreviation
-matches only one command, e.g. l == li == lis == list."""))
+matches only one command, e.g. l == li == lis == list."""))  # noqa: E122
         sys.stdout.write('\n'.join(commands) + '\n\n')
 
-    def help_commands_html(self, indent_re=re.compile(r'^(\s+)\S+')):
+    indent_re = re.compile(r'^(\s+)\S+')
+
+    def help_commands_html(self, indent_re=indent_re):
         """ Produce an HTML command list.
         """
         commands = sorted(iter(self.commands.values()),
@@ -174,7 +183,7 @@ def help_commands_html(self, indent_re=re.compile(r'^(\s+)\S+')):
     <td><tt>%(usage)s</tt><p>
 <pre>""" % locals())
             indent = indent_re.match(h[3])
-            if indent: indent = len(indent.group(1))
+            if indent: indent = len(indent.group(1))  # noqa: E701
             for line in h[3:]:
                 if indent:
                     print(line[indent:])
@@ -249,8 +258,10 @@ def help_all(self):
             print(_('%s:') % name)
             print('   ', _(command.__doc__))
 
-    def do_help(self, args, nl_re=re.compile('[\r\n]'),
-                indent_re=re.compile(r'^(\s+)\S+')):
+    nl_re = re.compile('[\r\n]')
+    # indent_re defined above
+
+    def do_help(self, args, nl_re=nl_re, indent_re=indent_re):
         ''"""Usage: help topic
         Give help about topic.
 
@@ -281,7 +292,7 @@ def do_help(self, args, nl_re=re.compile('[\r\n]'),
             lines = nl_re.split(_(help.__doc__))
             print(lines[0])
             indent = indent_re.match(lines[1])
-            if indent: indent = len(indent.group(1))
+            if indent: indent = len(indent.group(1))  # noqa: E701
             for line in lines[1:]:
                 if indent:
                     print(line[indent:])
@@ -320,17 +331,17 @@ def listTemplates(self, trace_search=False):
         # we're interested in where the directory containing "share" is
         debug = False
         templates = {}
-        if debug: print(__file__)
+        if debug: print(__file__)  # noqa: E701
         for N in 2, 4, 5, 6:
             path = __file__
             # move up N elements in the path
             for _i in range(N):
                 path = os.path.dirname(path)
             tdir = os.path.join(path, 'share', 'roundup', 'templates')
-            if debug or trace_search: print(tdir)
+            if debug or trace_search: print(tdir)  # noqa: E701
             if os.path.isdir(tdir):
                 templates = init.listTemplates(tdir)
-                if debug: print("  Found templates breaking loop")
+                if debug: print(" Found templates breaking loop")  # noqa: E701
                 break
 
         # search for data files parallel to the roundup
@@ -349,7 +360,7 @@ def listTemplates(self, trace_search=False):
         # path is /usr/local/lib/python3.10/site-packages
         tdir = os.path.join(path, sys.prefix[1:], 'share',
                             'roundup', 'templates')
-        if debug or trace_search: print(tdir)
+        if debug or trace_search: print(tdir)  # noqa: E701
         if os.path.isdir(tdir):
             templates.update(init.listTemplates(tdir))
 
@@ -359,29 +370,29 @@ def listTemplates(self, trace_search=False):
             # path is /usr/local/lib/python3.10/site-packages
             tdir = os.path.join(path, sys.base_prefix[1:], 'local', 'share',
                                 'roundup', 'templates')
-            if debug or trace_search: print(tdir)
+            if debug or trace_search: print(tdir)  # noqa: E701
             if os.path.isdir(tdir):
                 templates.update(init.listTemplates(tdir))
-                            # path is /usr/local/lib/python3.10/site-packages
-
+                # path is /usr/local/lib/python3.10/site-packages
 
             tdir = os.path.join(path, sys.base_prefix[1:], 'share',
                                 'roundup', 'templates')
-            if debug or trace_search: print(tdir)
+            if debug or trace_search: print(tdir)  # noqa: E701
             if os.path.isdir(tdir):
                 templates.update(init.listTemplates(tdir))
         except AttributeError:
             pass  # sys.base_prefix doesn't work under python2
 
         # Try subdirs of the current dir
         templates.update(init.listTemplates(os.getcwd()))
-        if debug or trace_search: print(os.getcwd() + '/*')
-            
+        if debug or trace_search: print(os.getcwd() + '/*')  # noqa: E701
+
         # Finally, try the current directory as a template
         template = init.loadTemplateInfo(os.getcwd())
-        if debug or trace_search: print(os.getcwd())
+        if debug or trace_search: print(os.getcwd())  # noqa: E701
         if template:
-            if debug: print("  Found template %s"%template['name'])
+            if debug: print("  Found template %s" %   # noqa: E701
+                            template['name'])
             templates[template['name']] = template
 
         return templates
@@ -434,7 +445,7 @@ def do_install(self, tracker_home, args):
                 ok = my_input(_(
 """WARNING: There appears to be a tracker in "%(tracker_home)s"!
 If you re-install it, you will lose all the data!
-Erase it? Y/N: """) % locals())
+Erase it? Y/N: """) % locals())  # noqa: E122
                 if ok.strip().lower() != 'y':
                     return 0
 
@@ -523,10 +534,9 @@ def do_install(self, tracker_home, args):
  You MUST run the "roundup-admin initialise" command once you've performed
  the above steps.
 ---------------------------------------------------------------------------
-""") % {
-    'database_config_file': os.path.join(tracker_home, 'schema.py'),
-    'database_init_file': os.path.join(tracker_home, 'initial_data.py'),
-})
+""") % {'database_config_file': os.path.join(tracker_home, 'schema.py'),
+        'database_init_file': os.path.join(tracker_home, 'initial_data.py')}) \
+        # noqa: E122
         return 0
 
     def _get_choice(self, list_name, prompt, options, argument, default=None):
@@ -598,7 +608,7 @@ def do_initialise(self, tracker_home, args):
                 ok = my_input(_(
 """WARNING: The database is already initialised!
 If you re-initialise it, you will lose all the data!
-Erase it? Y/N: """))
+Erase it? Y/N: """))  # noqa: E122
                 if ok.strip().lower() != 'y':
                     return 0
 
@@ -655,7 +665,8 @@ def do_get(self, args):
                         property = properties[propname]
                         if not (isinstance(property, hyperdb.Multilink) or
                                 isinstance(property, hyperdb.Link)):
-                            raise UsageError(_('property %s is not of type'
+                            raise UsageError(_(
+                                'property %s is not of type'
                                 ' Multilink or Link so -d flag does not '
                                 'apply.') % propname)
                         propclassname = self.db.getclass(property.classname).classname
@@ -672,7 +683,8 @@ def do_get(self, args):
                         property = properties[propname]
                         if not (isinstance(property, hyperdb.Multilink) or
                                 isinstance(property, hyperdb.Link)):
-                            raise UsageError(_('property %s is not of type'
+                            raise UsageError(_(
+                                'property %s is not of type'
                                 ' Multilink or Link so -d flag does not '
                                 'apply.') % propname)
                         propclassname = self.db.getclass(property.classname).classname
@@ -803,8 +815,10 @@ def do_filter(self, args):
                         try:
                             curclassname = curclass.getprops()[pn].classname
                         except KeyError:
-                            raise UsageError(_("Class %(curclassname)s has "
-                            "no property %(pn)s in %(propname)s." % locals()))
+                            raise UsageError(_(
+                                "Class %(curclassname)s has "
+                                "no property %(pn)s in %(propname)s." %
+                                locals()))
                         # get class object
                         curclass = self.get_class(curclassname)
                     except AttributeError:
@@ -982,7 +996,7 @@ def do_create(self, args):
         if len(args) == 1:
             # ask for the properties
             for key in properties:
-                if key == 'id': continue
+                if key == 'id': continue  # noqa: E701
                 value = properties[key]
                 name = value.__class__.__name__
                 if isinstance(value, hyperdb.Password):
@@ -994,7 +1008,8 @@ def do_create(self, args):
                         again = getpass.getpass(_('   %(propname)s (Again): ')
                                                 %
                                                 {'propname': key.capitalize()})
-                        if value != again: print(_('Sorry, try again...'))
+                        if value != again:
+                            print(_('Sorry, try again...'))
                     if value:
                         props[key] = value
                 else:
@@ -1009,7 +1024,8 @@ def do_create(self, args):
         for propname in props:
             try:
                 props[propname] = hyperdb.rawToHyperdb(self.db, cl, None,
-                                                    propname, props[propname])
+                                                       propname,
+                                                       props[propname])
             except hyperdb.HyperdbValueError as message:
                 raise UsageError(message)
 
@@ -1097,16 +1113,16 @@ def do_templates(self, args):
 
         for name in sorted(list(templates.keys())):
             templates[name]['description'] = textwrap.fill(
-                "\n".join([ line.lstrip() for line in
-                            templates[name]['description'].split("\n")]),
+                "\n".join([line.lstrip() for line in
+                           templates[name]['description'].split("\n")]),
                 70,
                 subsequent_indent="      "
             )
             print("""
 Name: %(name)s
 Path: %(path)s
 Desc: %(description)s
-"""%templates[name])
+""" % templates[name])
 
     def do_table(self, args):
         ''"""Usage: table classname [property[,property]*]
@@ -1399,7 +1415,7 @@ class colon_separated(csv.excel):
 
                 classkey = cl.getkey()
                 if classkey:  # False sorts before True, so negate is_retired
-                    keysort = lambda i: (cl.get(i, classkey),
+                    keysort = lambda i: (cl.get(i, classkey),  # noqa: E731
                                          not cl.is_retired(i))
                     all_nodes.sort(key=keysort)
                 # if there is no classkey no need to sort
@@ -1580,7 +1596,9 @@ def do_pack(self, args):
         self.db_uncommitted = True
         return 0
 
-    def do_reindex(self, args, desre=re.compile('([A-Za-z]+)([0-9]+)')):
+    designator_re = re.compile('([A-Za-z]+)([0-9]+)')
+
+    def do_reindex(self, args, desre=designator_re):
         ''"""Usage: reindex [classname|designator]*
         Re-generate a tracker's search indexes.
 
@@ -1637,8 +1655,9 @@ def do_security(self, args):
                 d = permission.__dict__
                 if permission.klass:
                     if permission.properties:
-                        sys.stdout.write(_(' %(description)s (%(name)s for "%(klass)s"' +
-                          ': %(properties)s only)\n') % d)
+                        sys.stdout.write(_(
+                            ' %(description)s (%(name)s for "%(klass)s"' +
+                            ': %(properties)s only)\n') % d)
                         # verify that properties exist; report bad props
                         bad_props = []
                         cl = self.db.getclass(permission.klass)
@@ -1649,7 +1668,11 @@ def do_security(self, args):
                             else:
                                 bad_props.append(p)
                         if bad_props:
-                            sys.stdout.write(_('\n  **Invalid properties for %(class)s: %(props)s\n\n') % {"class": permission.klass, "props": bad_props})
+                            sys.stdout.write(_(
+                                '\n  **Invalid properties for %(class)s: '
+                                '%(props)s\n\n') % {
+                                    "class": permission.klass,
+                                    "props": bad_props})
                             return 1
                     else:
                         sys.stdout.write(_(' %(description)s (%(name)s for '
@@ -1679,7 +1702,7 @@ def do_migrate(self, args):
         It's safe to run this even if it's not required, so just get
         into the habit.
         """
-        if getattr(self.db, 'db_version_updated'):
+        if self.db.db_version_updated:
             print(_('Tracker updated'))
             self.db_uncommitted = True
         else:
@@ -1755,7 +1778,8 @@ def run_command(self, args):
             self.tracker_home = ''
             print(_("Error: Couldn't open tracker: %(message)s") % locals())
             return 1
-        except ParsingOptionError as message: # message used via locals
+        # message used via locals
+        except ParsingOptionError as message:  # noqa: F841
             print("%(message)s" % locals())
             return 1
 
@@ -1766,7 +1790,7 @@ def run_command(self, args):
             # cli operator likely wants to have i18n as set in the
             # environment.
             # This is needed to fetch the locale's of the tracker's home dir.
-            self.db.i18n = get_translation (tracker_home = tracker.tracker_home)
+            self.db.i18n = get_translation(tracker_home=tracker.tracker_home)
 
         self.db.tx_Source = 'cli'
 
@@ -1801,13 +1825,13 @@ def interactive(self):
             except EOFError:
                 print(_('exit...'))
                 break
-            if not command: continue
+            if not command: continue  # noqa: E701
             try:
                 args = token.token_split(command)
             except ValueError:
                 continue        # Ignore invalid quoted token
-            if not args: continue
-            if args[0] in ('quit', 'exit'): break
+            if not args: continue  # noqa: E701
+            if args[0] in ('quit', 'exit'): break   # noqa: E701
             self.run_command(args)
 
         # exit.. check for transactions
@@ -1879,7 +1903,7 @@ def main(self):
                 self.interactive()
             else:
                 ret = self.run_command(args)
-                if self.db: self.db.commit()
+                if self.db: self.db.commit()  # noqa: E701
             return ret
         finally:
             if self.db: