Make createrun.py more PEP compliant (#6 & #17)

pymule/createrun.py

@@ -7,12 +7,13 @@ import argparse
 import sys
 import re
 
+
 def parsestat(s):
     return int(s.
-              replace("k","000").
-              replace("M","000000").
-              replace("G","000000000")
-    )
+               replace("k","000").
+               replace("M","000000").
+               replace("G","000000000"))
+
 
 def getref():
     try:
@@ -107,10 +108,10 @@ def create_menu(
     )
 
     header = (
-         "## Generated at %s by %s\n"
-       + "# git version: %s (%s)\n"
-       + "# To re-generate, run python %s \\\n"
-       ) % (
+      "## Generated at %s by %s\n"
+      "# git version: %s (%s)\n"
+      "# To re-generate, run python %s \\\n"
+    ) % (
         datetime.now().strftime("%H:%M on %B %d %Y"), os.environ['USER'],
         getbranch(), getref(), sys.argv[0]
     ) + " \\\n".join(
@@ -119,19 +120,21 @@ def create_menu(
 
     menu = "\n\nconf %s/%s-%s.conf" % (folder, whichbase, flavour)
     config = ("\n\n# specify the program to run relative to `pwd`\n"
-            + "binary=%s\n\n"
-            + "# specify the output folder\n"
-            + "folder=%s/\n\n"
-            + "# Specify the variables nenter_ad, itmx_ad, nenter and itmx\n"
-            + "# for each piece you want to run.\n"
-            + "declare -A STAT=(\n") % (binary, folder)
+              "binary=%s\n\n"
+              "# specify the output folder\n"
+              "folder=%s/\n\n"
+              "# Specify the variables nenter_ad, itmx_ad, nenter and itmx\n"
+              "# for each piece you want to run.\n"
+              "declare -A STAT=(\n") % (binary, folder)
 
     for part,stat in stats.iteritems():
         config += '  ["%s%s"]="%d\\n%d\\n%d\\n%d"\n' % (
             whichbase, part, stat[0], stat[1], stat[2], stat[3]
         )
         if stat[0] < stat[1] or stat[2] < stat[3]:
-            print "Warning! In part %s, calls and itmx might be swapped!" % part
+            print "Warning! In part %s, calls and itmx might be swapped!" % (
+                part
+            )
         n = stat[4] if len(stat) == 5 else len(seeds)
 
         xiloop = (
@@ -144,7 +147,8 @@ def create_menu(
 
         for xi in (xicuts if xiloop else [1.]):
             totalstat[0] += n*(stat[1] + stat[3])  # iterations
-            totalstat[1] += 1000*n*(stat[0]*stat[1] + stat[2]*stat[3])  # iterations
+            # iterations
+            totalstat[1] += 1000*n*(stat[0]*stat[1] + stat[2]*stat[3])
             menu += "\n\n"
             menu += '\n'.join(
                 "run %d %f %s%s %s 0" % (seed, xi, whichbase, part, flavour)
@@ -175,6 +179,7 @@ def create_menu(
         folder
     )
 
+
 def interogate(args={}):
     specs = inspect.getargspec(create_menu)
     defaults = dict(zip(specs.args, specs.defaults))
@@ -193,11 +198,12 @@ def interogate(args={}):
     ask('whichbase', "What type of process")
     ask('flavour', "Which flavour combination")
     ask('seeds', "How many / which seeds",
-        parser=lambda x: int(x) if ',' not in x else [int(i) for i in x.split(',')]
-    )
+        parser=lambda x: (
+            int(x) if ',' not in x else [int(i) for i in x.split(',')]
+        ))
     ask('xicuts', "Which xi cuts",
         parser=lambda x: [float(i) for i in x.split(',')]
-    )
+        )
     defaults['folder'] = args['whichbase'] + args['flavour']
     ask('folder', "Where to store data")
     ask('binary', "Which binary to run")