a few pep8 outside of scripts

Author: fchapoton

cont.py

@@ -13,11 +13,11 @@
 import subprocess
 import multiprocessing as mp
 import sys
+import time
 import pyinotify
 IN_MODIFY = pyinotify.IN_MODIFY
 IN_CREATE = pyinotify.IN_CREATE
 IN_DELETE = pyinotify.IN_DELETE
-import time
 
 
 class ChangeHandler(pyinotify.ProcessEvent):
@@ -66,7 +66,7 @@ def autocompile(paths, cmd):
     notifier = pyinotify.Notifier(wm, default_proc_fun=handler)
     wm.add_watch(paths,
                  # pyinotify.ALL_EVENTS,
-                 #IN_CREATE | IN_MODIFY | IN_DELETE,
+                 # IN_CREATE | IN_MODIFY | IN_DELETE,
                  IN_MODIFY,  # but still all?!
                  rec=True,
                  auto_add=True)

render.py

@@ -9,7 +9,7 @@
 import os
 import sys
 from os.path import join, normpath, exists, islink, basename, splitext
-#import multiprocessing as mp
+# import multiprocessing as mp
 from glob import glob
 import jinja2 as j2
 import markdown
@@ -25,6 +25,7 @@
 TARG_FILES = join(TARG, "files")
 j2env = None
 
+
 def index_changelogs():
     log("indexing changelogs")
     logs = [basename(_) for _ in glob(join("changelogs", "*.txt"))]
@@ -35,7 +36,8 @@ def sortlogs(fn):
         key.extend(int(_) for _ in version.split("."))
         return key
 
-    return reversed(sorted(logs, key = sortlogs))
+    return reversed(sorted(logs, key=sortlogs))
+
 
 def copy_aux_files():
     """
@@ -79,7 +81,7 @@ def render_task(arg):
     src = join(root, fn)
     dst = normpath(join("..", TARG, src))
     lvl = root.count(os.sep)
-    #log("processing/f: %s" % src, nl=False)
+    # log("processing/f: %s" % src, nl=False)
     if fn.endswith(".html"):
         # we ignore html files starting with "_" (e.g. language specific templates)
         # except the ones in doc, which might be __init__.html
@@ -152,7 +154,8 @@ def render():
     j2env.globals.update(config)
     j2env.globals["changelogs"] = index_changelogs()
     j2env.globals["packages"] = packages
-    j2env.globals['spkgs'] = sorted(packages['spkg'].values(), key = lambda x : x['name'].lower())
+    j2env.globals['spkgs'] = sorted(packages['spkg'].values(),
+                                    key=lambda x: x['name'].lower())
 
     j2env.filters["prefix"] = filter_prefix
     j2env.filters["markdown"] = filter_markdown
@@ -176,19 +179,19 @@ def render():
             src = join(root, path)
             dst = normpath(join("..", TARG, src))
 
-            #log("processing/d: %s" % src, nl=False)
+            # log("processing/d: %s" % src, nl=False)
 
             # we have to take care of symlinks here, too!
             if islink(src):
-                #log("SYMLINK/paths: %s" % src)
+                # log("SYMLINK/paths: %s" % src)
                 os.symlink(os.readlink(src), dst)
 
             elif not exists(dst):
-                #log("mkdir %s" % dst)
+                # log("mkdir %s" % dst)
                 os.makedirs(dst)
 
         # bad error handling, disabled parallelization
-        #pool.map(render_task, [(_, root) for _ in filenames])
+        # pool.map(render_task, [(_, root) for _ in filenames])
         for task in [(_, root) for _ in filenames]:
             render_task(task)
 

scripts/mirror-index.py

@@ -77,7 +77,8 @@ def create_meta(root):
     reldir = dir[len(base):]
     for fn in files:
       f = os.path.join(dir,fn)
-      if os.path.getsize(f) < MIN_SIZE * 1024 * 1024: continue
+      if os.path.getsize(f) < MIN_SIZE * 1024 * 1024:
+        continue
       print(">>> create_meta:", reldir, f)
 
   sys.exit(1)
@@ -128,7 +129,7 @@ def index(root, strip):
 
           knownMd5 = readMD5(dir) #reads file
 
-          even = True # even/odd for different backgrounds of table rows
+          even = True  # even/odd for different backgrounds of table rows
           filesKey = lambda fn:os.path.getmtime(os.path.join(dir,fn))
           for fn in sorted(files, reverse=True, key = filesKey):
               even = not even
@@ -240,7 +241,7 @@ def getNotesText(xml, dir):
      if os.path.exists(fn):
        try:
          notes = parse(fn).firstChild
-       except:
+       except:  # should use a precise exception
          # likely UTF8 error, instead link to file
          notes = xml.createElement(u"a")
          notes.setAttribute(u"href", "notes.txt")
@@ -253,6 +254,7 @@ def getNotesText(xml, dir):
        tr.appendChild(td)
        return tr
 
+
 def getTableHeaderDir(xml, dir):
      """
      the header for the subdirectory info

scripts/mirror-zsync.py

@@ -34,7 +34,7 @@ def mirrorcmd(p, fn):
 
 for root in roots:
     for dir, dirs, files in os.walk(root):
-        if not 'meta' in dirs:
+        if 'meta' not in dirs:
             continue
         print('Directory %s' % dir)
         for fn in files:

scripts/mirror_manager.py

@@ -295,7 +295,7 @@ def extract_timestamps(TS):
     for mirror in sorted(TS.keys(), key=lambda m: m.name):
         ts = TS[mirror]
         t = TIMESTAMP_RE.search(ts)
-        if not t is None and len(t.groups()) > 0:
+        if t is not None and len(t.groups()) > 0:
             OUTPUT += "%-20s %s\n" % (mirror.name, t.group(1))
             ret[mirror] = t.group(1)
         else:
@@ -314,7 +314,7 @@ def dissect_timestamps(TS):
     ret = {}
     for mirror in sorted(TS.keys(), key=lambda m: m.name):
         tokens = DELIM_RE.split(TS[mirror])
-        if not tokens is None and len(tokens) >= 3:
+        if tokens is not None and len(tokens) >= 3:
             time = datetime.strptime(tokens[0], '%Y-%m-%d %H:%M %Z')
             if len(tokens) == 3:
                 OUTPUT += "%-20s %-5s %-5s \n" % (mirror.name, tokens[1], tokens[2])

scripts/upstream_spkg_descr.py

@@ -35,7 +35,8 @@
 os.chdir(targ_dir)
 print("starting")
 for dirname in glob("*"):
-  if not os.path.isdir(dirname): continue
+  if not os.path.isdir(dirname):
+    continue
   # check if index.html exists (if not, also create md5sums.txt)
   if not os.path.exists(os.path.join(dirname, "index.html")):
     for auxfn in ["index.html", "md5sums.txt"]:
@@ -48,11 +49,8 @@
   print("%-25s" % dirname, end="")
   #print spkg_txt,
   txt = open(spkg_txt, "rb").read()#.decode("utf8")
-  f = open(spkg_target, "wb")
-  try:
+  with open(spkg_target, "wb") as f:
     f.write(NOTES_TMPL_1)
     f.write(cgi.escape(txt))
     f.write(NOTES_TMPL_2)
-  finally:
-    f.close()
   print("ok")