Sourcery Starbot ⭐ refactored akkana/scripts

analemma.py

@@ -40,19 +40,13 @@ def __init__(self, observer, year, lunar=False, background=None):
         self.width = 0
         self.height = 0
         # Even if we're actually showing the moon, call the object self.sun.
-        if self.lunar:
-            self.sun = ephem.Moon()
-        else:
-            self.sun = ephem.Sun()
+        self.sun = ephem.Moon() if self.lunar else ephem.Sun()
         self.sinusoidal = False
 
         self.sun_color = (1, 1, 0)
         self.backside_color = (1, .7, 0)
         self.text_color = (1, 1, 0)
-        if background:
-            self.background_color = background
-        else:
-            self.background_color = (0, 0, .6, 1)
+        self.background_color = background if background else (0, 0, .6, 1)
         self.special_dot_size = 5
 
     def draw_sun_position(self, date):
@@ -398,7 +392,7 @@ def draw(self, widget, ctx, background=None, labels=True):
         ctx.set_source_rgba(*background)
         if self.sinusoidal:
             self.draw_rectangle(0, 0, self.width, self.height)
-            for f in range(0, int(math.pi * 100)):
+            for f in range(int(math.pi * 100)):
                 theta = f/200.
                 (x, y) = self.project_sinusoidal(math.pi/2, theta)
                 self.draw_rectangle(x, y, self.width - 2*x, 4)
@@ -431,7 +425,7 @@ def draw(self, widget, ctx, background=None, labels=True):
 
             # For testing, try replacing 30 with, say, 5000 to see the
             # motion of the moon over many years.
-            for i in range(0, 30):
+            for _ in range(30):
                 self.draw_sun_position(transit)
 
                 # Also draw lunar analemmas 4 hours earlier and later:

androidfiles.py

@@ -148,9 +148,9 @@ def list_local_dir(path, sorted=True, sizes=False, recursive=False):
        like foo/bar/baz.jpg.
     """
     path = os.path.normpath(path)
-    lenpath = len(path)
     if recursive:
         file_list = []
+        lenpath = len(path)
         for root, dirs, files in os.walk(path):
             root = os.path.normpath(root)
             for f in files:
@@ -244,7 +244,7 @@ def copyfile(src, dst, move=False):
        doesn't create directories first.
        If move=True, use move rather than copy (remove the src).
     """
-    if not is_android(src) and not is_android(dst):
+    if not (is_android(src) or is_android(dst)):
         if move:
             shutil.move(src, dst)
         else:
@@ -299,10 +299,9 @@ def find_basename_size_match(pair, pairlist):
     match = None
     num_matches = 0
     for i, p in enumerate(pairlist):
-        if os.path.basename(p[0]) == base:
-            if p[1] == pair[1]:
-                match = i
-                num_matches += 1
+        if os.path.basename(p[0]) == base and p[1] == pair[1]:
+            match = i
+            num_matches += 1
     if num_matches == 1:
         return match
     elif num_matches > 1:
@@ -464,11 +463,7 @@ def find_dir_in(thedir, whichlist):
         # match books whose titles start with the same name as the dir.
         if not thedir.endswith('/'):
             thedir += '/'
-        for pair in whichlist:
-            if pair[0].startswith(thedir):
-                return True
-
-        return False
+        return any(pair[0].startswith(thedir) for pair in whichlist)
 
     def remember_needed_dirs(f):
         """Check full pathname f (from src_ls) to see if its dirname

bdump

@@ -22,26 +22,26 @@ def Usage() :
     print("Usage: %s [-cxd] file ..." % os.path.basename(sys.argv[0]))
     exit(1)
 
-def parse_opts() :
+def parse_opts():
     global do_char, do_hex, do_dec, file_list, multi_format
     num_formats = 0
-    for i in range(1, len(sys.argv)) :
+    for i in range(1, len(sys.argv)):
         if sys.argv[i][0] != '-' :
             file_list = sys.argv[i:]
             break
-        for c in sys.argv[i][1:] :
-            if c == 'c' :
+        for c in sys.argv[i][1:]:
+            if c == 'c':
                 do_char = True
-                num_formats = num_formats + 1
-            elif c == 'x' :
-                do_hex = True
-                num_formats = num_formats + 1
-            elif c == 'd' :
+                num_formats += 1
+            elif c == 'd':
                 do_dec = True
-                num_formats = num_formats + 1
-            elif c == 'h' :
+                num_formats += 1
+            elif c == 'h':
                 Usage()
 
+            elif c == 'x':
+                do_hex = True
+                num_formats += 1
     if num_formats == 0 :
         do_char = True
         do_hex = True

birdcodes.py

@@ -32,11 +32,7 @@ def __init__(self):
         fields = next(reader)
         code4 = fields.index('4code')
         name = fields.index('name')
-        if 'sci_name' in fields:
-            sciname = fields.index('sci_name')
-        else:
-            sciname = None
-
+        sciname = fields.index('sci_name') if 'sci_name' in fields else None
         for fields in reader:
             if sciname:
                 self.allbirds[fields[code4]] = (fields[name], fields[sciname])
@@ -53,11 +49,7 @@ def __init__(self):
         fields = next(reader)
         code4 = fields.index('4code')
         name = fields.index('name')
-        if 'sci_name' in fields:
-            sciname = fields.index('sci_name')
-        else:
-            sciname = None
-
+        sciname = fields.index('sci_name') if 'sci_name' in fields else None
         for fields in reader:
             if fields[code4] in self.allbirds:
                 continue
@@ -83,10 +75,7 @@ def match_code(self, matchcode):
         return None
 
     def match_codes(self, matchcodes):
-        matches = []
-        for code in matchcode:
-            matches.append(self.match_code(code))
-        return matches
+        return [self.match_code(code) for code in matchcode]
 
     def match_name(self, matchname, fuzzy=True):
         matchname = matchname.upper()

cachefile.py

@@ -218,7 +218,7 @@ def time_bounds(self, starttime=None, endtime=None, day=None, now=None):
             starttime = self.day_start(day)
             endtime = self.day_end(day)
 
-        elif not starttime and not endtime:
+        elif not (starttime or endtime):
             # Set back to the beginning of the day:
             starttime = self.day_start(now)
             # and end now.
@@ -235,9 +235,11 @@ def time_bounds(self, starttime=None, endtime=None, day=None, now=None):
             # Else end at the end of the day we started:
             else:
                 endtime = self.day_end(starttime)
-        elif starttime.year != endtime.year \
-             or starttime.month != endtime.month \
-             or starttime.day != endtime.day:
+        elif not (
+            starttime.year == endtime.year
+            and starttime.month == endtime.month
+            and starttime.day == endtime.day
+        ):
             raise ValueError("time_bounds: %s and %s must start and end on the same day" % (endtime, starttime))
 
         if starttime > endtime:
@@ -260,10 +262,7 @@ def get_data(self, starttime=None, endtime=None):
         data = []
 
         if not endtime:
-            if starttime:
-                endtime = self.day_start(starttime)
-            else:
-                endtime = datetime.datetime.now()
+            endtime = self.day_start(starttime) if starttime else datetime.datetime.now()
         if not starttime:
             starttime = self.day_start(endtime)
 

cellaut.py

@@ -74,10 +74,7 @@ def __repr__(self):
         out = ''
         for row in self.grid:
             for cell in row:
-                if self.characters:
-                    out += self.characters[cell]
-                else:
-                    out += '%3d' % cell
+                out += self.characters[cell] if self.characters else '%3d' % cell
             out += '\n'
         return out
 
@@ -126,25 +123,25 @@ def idle_handler(self, widget):
         if self.running:
             return True
 
-    def key_press_event(self, widget, event) :
-        if event.string == "q" :
-            self.cellgrid.quit()
-            return True
-
-        if event.string == " " :
+    def key_press_event(self, widget, event):
+        if event.string == " ":
             self.cellgrid.update(self.rule)
             self.draw()
             self.running = False
             return True
 
-        if event.string == "c" :
+        elif event.string == "c":
             if self.running:
                 return True
             self.running = True
             gobject.timeout_add(self.timeout, self.idle_handler,
                                 self.drawing_area)
             return True
 
+        elif event.string == "q":
+            self.cellgrid.quit()
+            return True
+
         return False
 
     def expose_handler(self, widget, event):

cleanhtml.py

@@ -11,7 +11,7 @@ def remove_empty_tags(soup):
         innerhtml = t.text
         # print "tag", t
         # print "innerHTML", innerhtml
-        if not innerhtml or not innerhtml.strip():
+        if not (innerhtml and innerhtml.strip()):
             t.extract()
 
 def prettyprint(soup):

conjunctions.py

@@ -56,10 +56,7 @@
 
 planets_by_name = ["Moon", "Mercury", "Venus", "Mars", "Jupiter", "Saturn"]
 
-planets_up = {}
-for planet in planets:
-    planets_up[planet.name] = None
-
+planets_up = {planet.name: None for planet in planets}
 saw_conjunction = False
 visible_planets = []
 
@@ -223,11 +220,7 @@ def conjstr(b1, b2, sepdate, minsep):
                 if hour > sepdate_tuple[3]:
                     sepdate_tuple[2] -= 1
                 sepdate_tuple[3] = hour
-                if hour > 12:
-                    hourstr = str(hour-12) + " pm"
-                else:
-                    hourstr = str(hour) + " am"
-
+                hourstr = str(hour-12) + " pm" if hour > 12 else str(hour) + " am"
                 seps = "POSSIBLE OCCULTATION around " + hourstr
             else:
                 seps = sepstr(minsep)
@@ -350,12 +343,8 @@ def finish_planet(p, d, observer, output_format):
     observer.date = d
     transit = observer.previous_transit(body) - ephem.hour * timezone
     transit = list(ephem.Date(transit).tuple())
-    if transit[3] < 3 or transit[3] > 12:
-        when = "evening"
-    else:
-        when = "morning"
-
-    if p == "Venus" or p == "Mercury":
+    when = "evening" if transit[3] < 3 or transit[3] > 12 else "morning"
+    if p in ["Venus", "Mercury"]:
         if when == "evening":
             isvis = p + " is visible in the early evening sky."
         else:
@@ -386,28 +375,33 @@ def finish_planet(p, d, observer, output_format):
             isvis += '.'
         crescents[p] = [ None, None ]
 
-    if output_format == "csv" or output_format == "sql":
-        if p != 'Moon':
-            if web_image[p]:
-                img = web_image[p][0]
-                cred = web_image[p][1]
-                w = web_image[p][2]
-                h = web_image[p][3]
-            else:
-                img = ""
-                cred = ""
-                w = ""
-                h = ""
-
-            if output_format == "csv":
-                print("%s,%s,%s,,%s,,%s,%s,%s,%s" % \
-                      (p, datestr(planets_up[p]), datestr(d), isvis,
-                       img, w, h, cred))
-            else:
-                print("('%s', 'astronomy', 'naked eye', '%s', '%s', '%s', '%s', %s, %s, '%s' )," % \
-                      (p, datestr(planets_up[p]), datestr(d), isvis,
-                       img, w, h, cred))
-    else:
+    if (
+        output_format == "csv"
+        and p != 'Moon'
+        or output_format != "csv"
+        and output_format == "sql"
+        and p != 'Moon'
+    ):
+        if web_image[p]:
+            img = web_image[p][0]
+            cred = web_image[p][1]
+            w = web_image[p][2]
+            h = web_image[p][3]
+        else:
+            img = ""
+            cred = ""
+            w = ""
+            h = ""
+
+        if output_format == "csv":
+            print("%s,%s,%s,,%s,,%s,%s,%s,%s" % \
+                  (p, datestr(planets_up[p]), datestr(d), isvis,
+                   img, w, h, cred))
+        else:
+            print("('%s', 'astronomy', 'naked eye', '%s', '%s', '%s', '%s', %s, %s, '%s' )," % \
+                  (p, datestr(planets_up[p]), datestr(d), isvis,
+                   img, w, h, cred))
+    elif output_format not in ["csv", "sql"]:
         print(datestr(planets_up[p]), "to", datestr(d), ":", isvis)
 
     planets_up[p] = None

countsyl

@@ -47,7 +47,7 @@ def count_syllables(word):
                 if verbose: print("new syllable")
                 minsyl += 1
                 maxsyl += 1
-            elif on_vowel and not in_diphthong and c != lastchar:
+            elif not in_diphthong and c != lastchar:
                 # We were already in a vowel.
                 # Don't increment anything except the max count,
                 # and only do that once per diphthong.

decodemail.py

@@ -39,11 +39,7 @@ def decode_piece(piece):
     # anything about whether part[0] is str or bytes.
     # So you have to check the type.
     for part in decode_header(piece):
-        if type(part[0]) is bytes:
-            ret += part[0].decode(errors='replace')
-        else:
-            ret += part[0]
-
+        ret += part[0].decode(errors='replace') if type(part[0]) is bytes else part[0]
         # Special case: the header itself comes out with charset None
         # and decode doesn't add a space between it and the next part,
         # even though there was a space in the original. So add one
@@ -159,7 +155,7 @@ def decode_file(filename, header_wanted, all=False, casematch=False):
 all = False
 
 if len(sys.argv) > 2:
-    if sys.argv[1] == '-h' or sys.argv[1] == '--help':
+    if sys.argv[1] in ['-h', '--help']:
         print(Usage)
         sys.exit(1)