Sourcery Starbot ⭐ refactored akkana/scripts #11

SourceryAI · 2020-06-05T14:16:51Z

Thanks for starring sourcery-ai/sourcery ✨ 🌟 ✨

Here's your pull request refactoring your most popular Python repo.

If you want Sourcery to refactor all your Python repos and incoming pull requests install our bot.

Review changes via command line

To manually merge these changes, make sure you're on the master branch, then run:

git fetch https://github.com/sourcery-ai-bot/scripts master
git merge --ff-only FETCH_HEAD
git reset HEAD^

SourceryAI

Due to GitHub API limits, only the first 60 comments can be shown.

SourceryAI · 2020-06-05T14:16:52Z

analemma.py

-        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)


Function AnalemmaWindow.__init__ refactored with the following changes:

Replace if statement with if expression

SourceryAI · 2020-06-05T14:16:53Z

analemma.py

-            for f in range(0, int(math.pi * 100)):
+            for f in range(int(math.pi * 100)):


Function AnalemmaWindow.draw refactored with the following changes:

Replace range(0, x) with range(x)

Replace unused for index with underscore

SourceryAI · 2020-06-05T14:16:53Z

androidfiles.py

-    lenpath = len(path)
    if recursive:
        file_list = []
+        lenpath = len(path)


Function list_local_dir refactored with the following changes:

Move assignments closer to their usage

SourceryAI · 2020-06-05T14:16:53Z

androidfiles.py

       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)):


Function copyfile refactored with the following changes:

Simplify logical expression

SourceryAI · 2020-06-05T14:16:53Z

androidfiles.py

-        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


Function find_basename_size_match refactored with the following changes:

Merge nested if conditions

SourceryAI · 2020-06-05T14:16:56Z

conjunctions.py

-                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"


Function Conjunction.closeout.conjstr refactored with the following changes:

Replace if statement with if expression

SourceryAI · 2020-06-05T14:16:56Z

conjunctions.py

-    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"]:


Function finish_planet refactored with the following changes:

Replace if statement with if expression

Replace multiple comparisons of same variable with in operator

Simplify conditional into switch-like form

Split conditional into multiple branches

Merge duplicate blocks in conditional

Remove redundant conditional

Remove empty elif clause

Simplify logical expression

SourceryAI · 2020-06-05T14:16:57Z

countsyl

                minsyl += 1
                maxsyl += 1
-            elif on_vowel and not in_diphthong and c != lastchar:
+            elif not in_diphthong and c != lastchar:


Function count_syllables refactored with the following changes:

Remove redundant conditional

SourceryAI · 2020-06-05T14:16:57Z

decodemail.py

-        else:
-            ret += part[0]
-
+        ret += part[0].decode(errors='replace') if type(part[0]) is bytes else part[0]


Function decode_piece refactored with the following changes:

Replace if statement with if expression

SourceryAI · 2020-06-05T14:16:57Z

decodemail.py

-    if sys.argv[1] == '-h' or sys.argv[1] == '--help':
+    if sys.argv[1] in ['-h', '--help']:


Lines 162-162 refactored with the following changes:

Replace multiple comparisons of same variable with in operator

SourceryAI · 2020-06-05T14:16:59Z

domaincheck.py

-    for i in range(RETRIES):
+    for _ in range(RETRIES):
        try:
-            domain = whois.whois(name)
-            return domain
+            return whois.whois(name)


Function get_domain refactored with the following changes:

Inline variable that is only used once

Replace unused for index with underscore

SourceryAI · 2020-06-05T14:17:00Z

domaincheck.py

-        if d[1] < two_months_from_now:
-            alert = "***"
-        else:
-            alert = ""
+        alert = "***" if d[1] < two_months_from_now else ""


Lines 66-69 refactored with the following changes:

Replace if statement with if expression

SourceryAI · 2020-06-05T14:17:00Z

eggtimer

-    else:
-      message = "Wake up!"
-
+    message = ' '.join(sys.argv[2:]) if len(sys.argv) > 2 else "Wake up!"


Lines 68-72 refactored with the following changes:

Replace if statement with if expression

SourceryAI · 2020-06-05T14:17:00Z

epubtag.py

-            return
-


Function EpubBook.parse_contents refactored with the following changes:

Remove unreachable code

SourceryAI · 2020-06-05T14:17:01Z

epubtag.py

-            if len(authors) > 1:
-                outstr += "Authors: "
-            else:
-                outstr += "Author: "
+            outstr += "Authors: " if len(authors) > 1 else "Author: "


Function EpubBook.info_string refactored with the following changes:

Replace if statement with if expression

SourceryAI · 2020-06-05T14:17:03Z

fotogr

-        if pat in tags:
-            return True
-    return False
+    return any(pat in tags for pat in orpats)


Function has_match refactored with the following changes:

Use any() instead of for loop

SourceryAI · 2020-06-05T14:17:04Z

geojsonmap.py

-legend_patches = []
-for c in colormap:
-    legend_patches.append(mpatches.Patch(color=colormap[c], label=c))
+legend_patches = [mpatches.Patch(color=colormap[c], label=c) for c in colormap]


Lines 53-55 refactored with the following changes:

Convert for loop into list comprehension

SourceryAI · 2020-06-05T14:17:04Z

gitbranchsync.py


-    for branch in localbranches:
-        lb = localbranches[branch]
+    for branch, lb in localbranches.items():


Function list_branches refactored with the following changes:

Use items() to directly unpack dictionary values

SourceryAI · 2020-06-05T14:17:04Z

gitbranchsync.py

-    if not args.list and not args.check and not args.track:
+    if not (args.list or args.check or args.track):


Function main refactored with the following changes:

Simplify logical expression

SourceryAI · 2020-06-05T14:17:04Z

gquickbrowse

    def zoom_hundred_cb(self, menu_item, web_view):
        """Zoom 100%"""
-        if not (web_view.get_zoom_level() == 1.0):
+        if web_view.get_zoom_level() != 1.0:


Function WebToolbar.zoom_hundred_cb refactored with the following changes:

Simplify logical expression

SourceryAI · 2020-06-05T14:17:07Z

hotdog.py

            tcrit = piece.critical

-            if not tcurrent or (not tmax and not tcrit):
+            if not (tcurrent and (tmax or tcrit)):


Function fetch_temps refactored with the following changes:

Simplify logical expression

SourceryAI · 2020-06-05T14:17:08Z

hotdog.py

-        if quad[1] > quad[2]:
-            return True
-    return False
+    return any(quad[1] > quad[2] for quad in temps)


Function overtemp refactored with the following changes:

Use any() instead of for loop

SourceryAI · 2020-06-05T14:17:08Z

htmlmail.py


 def contains_non_ascii_characters(s):
-    return not all(ord(c) < 128 for c in s)
+    return any(ord(c) >= 128 for c in s)


Function contains_non_ascii_characters refactored with the following changes:

Simplify inverted any() and all() calls

SourceryAI · 2020-06-05T14:17:08Z

imageviewer.py

        imagewin.next_image()
        return
-    if event.string == "q":
+    elif event.string == "q":


Function key_press_event refactored with the following changes:

Simplify conditional into switch-like form

SourceryAI · 2020-06-05T14:17:09Z

imageviewer3.py

-        if True:
-            rect = self.get_allocation()
-            w = rect.width
-            h = rect.height
-            if w != self.width or h != self.height:
-                # get_allocation() gives a number that's too large,
-                # and if we later try to draw_rectangle() with these
-                # dimensions, we'll only get half the rectangle horizontally.
-                # I have no idea why this is happening, but subtracting a
-                # few pixels from allocation width is a temporary workaround.
-                self.width = w    # -5
-                self.height = h
-
-            # Have we had load_image called, but we weren't ready for it?
-            # Now, theoretically, we are ... so call it again.
-            if w and h and self.cur_img and not self.pixbuf:
-                self.prepare_image()
+        rect = self.get_allocation()
+        w = rect.width
+        h = rect.height
+        if w != self.width or h != self.height:
+            # get_allocation() gives a number that's too large,
+            # and if we later try to draw_rectangle() with these
+            # dimensions, we'll only get half the rectangle horizontally.
+            # I have no idea why this is happening, but subtracting a
+            # few pixels from allocation width is a temporary workaround.
+            self.width = w    # -5
+            self.height = h
+
+        # Have we had load_image called, but we weren't ready for it?
+        # Now, theoretically, we are ... so call it again.
+        if w and h and self.cur_img and not self.pixbuf:
+            self.prepare_image()


Function ImageViewer.draw refactored with the following changes:

Remove redundant conditional

SourceryAI · 2020-06-05T14:17:12Z

mnist.py

       the next one.
    """
-    if e.key == 'ctrl+q' or e.key == 'q':
+    if e.key in ['ctrl+q', 'q']:


Function key_press refactored with the following changes:

Replace multiple comparisons of same variable with in operator

SourceryAI · 2020-06-05T14:17:12Z

monmon.py

-            if mname in self.mon_geom:
-                active.append(mname)
-        return active
+        return [mname for mname in self.monitors if mname in self.mon_geom]


Function MonMon.active_monitors refactored with the following changes:

Convert for loop into list comprehension

Inline variable that is only used once

SourceryAI · 2020-06-05T14:17:13Z

monmon.py

-        inactive = []
-        for mname in self.monitors:
-            if mname not in self.mon_geom:
-                inactive.append(mname)
-        return inactive
+        return [mname for mname in self.monitors if mname not in self.mon_geom]


Function MonMon.inactive_monitors refactored with the following changes:

Convert for loop into list comprehension

Inline variable that is only used once

SourceryAI · 2020-06-05T14:17:13Z

monmon.py

-            if self.laptop_screen == mon['name']:
-                islaptop = "    **laptop"
-            else:
-                islaptop = ""
+            islaptop = "    **laptop" if self.laptop_screen == mon['name'] else ""


Function MonMon.print_monitor refactored with the following changes:

Replace if statement with if expression

SourceryAI · 2020-06-05T14:17:13Z

moonpos

    if start <= end:
        return list(range(start, end))
-    return list(range(start, max)) + list(range(0, end))
+    return list(range(start, max)) + list(range(end))


Function discont_range refactored with the following changes:

Replace range(0, x) with range(x)

Refactored by Sourcery

47da828

SourceryAI commented Jun 5, 2020

View reviewed changes

		for f in range(0, int(math.pi * 100)):
		for f in range(int(math.pi * 100)):

		if sys.argv[1] == '-h' or sys.argv[1] == '--help':
		if sys.argv[1] in ['-h', '--help']:

		if not args.list and not args.check and not args.track:
		if not (args.list or args.check or args.track):

Sourcery Starbot ⭐ refactored akkana/scripts #11

Are you sure you want to change the base?

Sourcery Starbot ⭐ refactored akkana/scripts #11

Uh oh!

Conversation

SourceryAI commented Jun 5, 2020

Uh oh!

SourceryAI left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant