Sourcery refactored master branch #73
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
| loglevel = log_levels[level] | ||
| else: | ||
| loglevel = log_levels['3'] | ||
| loglevel = log_levels.get(level, log_levels['3']) |
Author
There was a problem hiding this comment.
Function setup_logging refactored with the following changes:
- Simplify dictionary access using default get
Comment on lines
-112
to
-120
| if type(s) is unicode: | ||
| if type(s) is unicode or type(s) is not str: | ||
| return s | ||
| elif type(s) is str: | ||
| else: | ||
| try: | ||
| return unicode(s, term_encoding) | ||
| except ValueError: | ||
| logger.error('s2or3 exception: {0}'.format(s)) | ||
| else: | ||
| return s |
Author
There was a problem hiding this comment.
Function s2or3 refactored with the following changes:
- Merge duplicate blocks in conditional
- Remove redundant conditional
Comment on lines
-495
to
+492
| if s.upper() == s and s.lower() != s: | ||
| shift = "Shift-" | ||
| else: | ||
| shift = "" | ||
| if mac: | ||
| # return "{0}Cmd-{1}".format(shift, s), "<{0}Command-{1}>".format(shift, s) | ||
| return "{0}Ctrl-{1}".format(shift, s.upper()), "<{0}Control-{1}>".format(shift, s) | ||
| else: | ||
| return "{0}Ctrl-{1}".format(shift, s.upper()), "<{0}Control-{1}>".format(shift, s) | ||
| shift = "Shift-" if s.upper() == s and s.lower() != s else "" | ||
| # return "{0}Cmd-{1}".format(shift, s), "<{0}Command-{1}>".format(shift, s) | ||
| return "{0}Ctrl-{1}".format(shift, s.upper()), "<{0}Control-{1}>".format(shift, s) |
Author
There was a problem hiding this comment.
Function commandShortcut refactored with the following changes:
- Hoist repeated code outside conditional statement
- Replace if statement with if expression
Comment on lines
-511
to
+500
| if s.upper() == s and s.lower() != s: | ||
| shift = "Shift-" | ||
| else: | ||
| shift = "" | ||
| shift = "Shift-" if s.upper() == s and s.lower() != s else "" |
Author
There was a problem hiding this comment.
Function optionShortcut refactored with the following changes:
- Replace if statement with if expression
Comment on lines
-543
to
+529
| if dn > 1: | ||
| days = dn - 1 | ||
| else: | ||
| days = 0 | ||
| days = dn - 1 if dn > 1 else 0 |
Author
There was a problem hiding this comment.
Function get_week refactored with the following changes:
- Inline variable that is only used once
- Replace if statement with if expression
Comment on lines
-1934
to
+1921
| Checkbutton(self.win, text=self.options[i][0], padx=20, variable=self.check_values[i]).pack(padx=10, anchor=W) | ||
| Checkbutton( | ||
| self.win, text=txt, padx=20, variable=self.check_values[i] | ||
| ).pack(padx=10, anchor=W) | ||
|
|
Author
There was a problem hiding this comment.
Function OptionsDialog.__init__ refactored with the following changes:
- Swap positions of nested conditionals
- Hoist repeated code outside conditional statement
- Use previously assigned local variable
Comment on lines
+1099
to
-1105
| width0 = self.tree.column('#0')['width'] | ||
| if self.labels: | ||
| width0 = self.tree.column('#0')['width'] | ||
| self.tree.column('#0', width=width0 + self.col2_width) | ||
| self.tree.column('#1', width=0) | ||
| self.labels = False | ||
| else: | ||
| width0 = self.tree.column('#0')['width'] |
Author
There was a problem hiding this comment.
Function App.toggleLabels refactored with the following changes:
- Hoist repeated code outside conditional statement
Comment on lines
-1176
to
+1175
| if self.weekly or self.monthly: | ||
| master = self.canvas | ||
| else: | ||
| master = self.tree | ||
|
|
||
| master = self.canvas if self.weekly or self.monthly else self.tree |
Author
There was a problem hiding this comment.
Function App.selectCalendars refactored with the following changes:
- Replace if statement with if expression
Comment on lines
-1239
to
+1234
| if mac: | ||
| cmd = 'open' + " {0}".format(path) | ||
| else: | ||
| cmd = 'xdg-open' + " {0}".format(path) | ||
| cmd = 'open' + " {0}".format(path) if mac else 'xdg-open' + " {0}".format(path) |
Author
There was a problem hiding this comment.
Function App.openWithDefault refactored with the following changes:
- Replace if statement with if expression
Comment on lines
-1253
to
+1250
| return | ||
| else: | ||
| cmd = "lp -s -o media='letter' -o cpi=12 -o lpi=8 -o page-left=48 -o page-right=48 -o page-top=48 -o page-bottom=48 {0}\n".format(loop.tmpfile) | ||
| # cmd = "lpr -l {0}".format(loop.tmpfile) | ||
| self.check_output(cmd) | ||
| return | ||
|
|
||
| return |
Author
There was a problem hiding this comment.
Function App.printWithDefault refactored with the following changes:
- Hoist repeated code outside conditional statement
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Branch
masterrefactored by Sourcery.If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.
See our documentation here.
Run Sourcery locally
Reduce the feedback loop during development by using the Sourcery editor plugin:
Review changes via command line
To manually merge these changes, make sure you're on the
masterbranch, then run: