Sourcery refactored master branch

misc/abandoned_roman_numerals_example/rome.py

@@ -1,6 +1,6 @@
 ROMAN_NUMERALS = ('I', 'V', 'X')
 def add(augend, addend):
-    if not isinstance(augend, basestring) or not isinstance(addend, basestring):
+    if not (isinstance(augend, basestring) and isinstance(addend, basestring)):
         raise ValueError
 
     simple_augend = augend.replace('IV', 'IIII')
@@ -13,6 +13,10 @@ def add(augend, addend):
 
     ordered_sum = ''.join(reversed(sorted(simple_sum)))
 
-    canonicalised_sum = ordered_sum.replace('IIIII', 'V').replace('IIII', 'IV').replace('VV', 'X').replace('VIV', 'IX')
-    return canonicalised_sum
+    return (
+        ordered_sum.replace('IIIII', 'V')
+        .replace('IIII', 'IV')
+        .replace('VV', 'X')
+        .replace('VIV', 'IX')
+    )
 

misc/get_stats.py

@@ -48,7 +48,7 @@ def main():
         for commit in commits:
             checkout_commit(commit.hash)
             all_wordcounts[commit] = get_wordcounts()
-            filenames.update(set(wc.filename for wc in all_wordcounts[commit]))
+            filenames.update({wc.filename for wc in all_wordcounts[commit]})
 
         with open(os.path.join(BOOK_ROOT, 'wordcounts.tsv'), 'w') as csvfile:
             fieldnames = ['date.{}'.format(thing) for thing in ['year', 'month', 'day', 'hour']]
@@ -58,14 +58,16 @@ def main():
             writer = csv.DictWriter(csvfile, fieldnames, dialect="excel-tab")
             writer.writeheader()
             for commit, wordcounts in all_wordcounts.items():
-                row = {}
-                row['hash'] = commit.hash
-                row['subject'] = commit.subject
-                row['date'] = ''
-                row['date.year'] = commit.date.year
-                row['date.month'] = commit.date.month
-                row['date.day'] = commit.date.day
-                row['date.hour'] = commit.date.hour
+                row = {
+                    'hash': commit.hash,
+                    'subject': commit.subject,
+                    'date': '',
+                    'date.year': commit.date.year,
+                    'date.month': commit.date.month,
+                    'date.day': commit.date.day,
+                    'date.hour': commit.date.hour,
+                }
+
                 for wordcount in wordcounts:
                     row[wordcount.filename + " (words)"] = wordcount.words
                     row[wordcount.filename + " (lines)"] = wordcount.lines

misc/plot.py

@@ -14,10 +14,7 @@ def get_data_from_csv():
             for field in reader.fieldnames:
                 if 'words' in field:
                     val = row[field]
-                    if val:
-                        fixed_row[field] = val
-                    else:
-                        fixed_row[field] = 0
+                    fixed_row[field] = val if val else 0
             date = datetime(int(row['date.year']), int(row['date.month']), int(row['date.day']), int(row['date.hour']),)
             fixed_row['date'] = date
             data.append(fixed_row)

tests/book_parser.py

@@ -121,11 +121,7 @@ def parse_output(listing):
 
     outputs = []
     output_before = listing.text
-    if output_before:
-        output_before = fix_newlines(output_before.strip())
-    else:
-        output_before = ''
-
+    output_before = fix_newlines(output_before.strip()) if output_before else ''
     for command in commands:
         if '$' in output_before and '\n' in output_before:
             last_cr = output_before.rfind('\n')

tests/book_tester.py

@@ -42,8 +42,8 @@
 
 def contains(inseq, subseq):
     return any(
-        inseq[pos:pos + len(subseq)] == subseq
-        for pos in range(0, len(inseq) - len(subseq) + 1)
+        inseq[pos : pos + len(subseq)] == subseq
+        for pos in range(len(inseq) - len(subseq) + 1)
     )
 
 
@@ -73,12 +73,11 @@ def strip_mock_ids(output):
         r"Mock name='\1' id='XX'>",
         output,
     )
-    strip_all_mocks = re.sub(
+    return re.sub(
         r"Mock id='(\d+)'>",
         r"Mock id='XX'>",
         strip_mocks_with_names,
     )
-    return strip_all_mocks
 
 def strip_object_ids(output):
     return re.sub('0x([0-9a-f]+)>', '0xXX>', output)
@@ -106,13 +105,12 @@ def strip_git_hashes(output):
         r"index XXXXXXX\.\.XXXXXXX 100644",
         output,
     )
-    fixed_commit_numbers = re.sub(
+    return re.sub(
         r"^[a-f0-9]{7} ",
         r"XXXXXXX ",
         fixed_indexes,
         flags=re.MULTILINE,
     )
-    return fixed_commit_numbers
 
 
 def strip_callouts(output):
@@ -122,13 +120,12 @@ def strip_callouts(output):
         output,
         flags=re.MULTILINE,
     )
-    minus_new_callouts = re.sub(
+    return re.sub(
         r"^(.+)  \(\d+\)$",
         r"\1",
         minus_old_callouts,
         flags=re.MULTILINE,
     )
-    return minus_new_callouts
 
 
 def standardise_library_paths(output):
@@ -527,9 +524,12 @@ def assert_console_output_correct(self, actual, expected, ls=False):
             else:
                 self.assertLineIn(line, [l.strip() for l in actual_lines])
 
-        if len(expected_lines) > 4 and '[...' not in expected_fixed:
-            if expected.type != 'qunit output':
-                self.assertMultiLineEqual(actual_fixed.strip(), expected_fixed.strip())
+        if (
+            len(expected_lines) > 4
+            and '[...' not in expected_fixed
+            and expected.type != 'qunit output'
+        ):
+            self.assertMultiLineEqual(actual_fixed.strip(), expected_fixed.strip())
 
         expected.was_checked = True
 
@@ -614,10 +614,6 @@ def unset_PYTHONDONTWRITEBYTECODE(self):
 
     def _strip_out_any_pycs(self):
         return
-        self.sourcetree.run_command(
-            r"find . -name __pycache__ -exec rm -rf {} \;",
-            ignore_errors=True
-        )
 
 
     def run_test_and_check_result(self, bdd=False):
@@ -654,12 +650,6 @@ def run_js_tests(self, tests_path):
         print('fixed phantomjs output', output)
         return output
 
-        os.chmod(SLIMERJS_BINARY, os.stat(SLIMERJS_BINARY).st_mode | stat.S_IXUSR)
-        os.environ['SLIMERJSLAUNCHER'] = '/usr/bin/firefox'
-        return subprocess.check_output(
-            ['xvfb-run', '--auto-servernum', SLIMERJS_BINARY, PHANTOMJS_RUNNER, tests_path]
-        ).decode()
-
 
     def check_qunit_output(self, expected_output):
         lists_tests = os.path.join(
@@ -735,9 +725,10 @@ def check_diff_or_status(self, pos):
             'diff' in self.listings[pos] or 'status' in self.listings[pos]
         )
         git_output = self.run_command(self.listings[pos])
-        if not any('/' + l in git_output for l in LIKELY_FILES):
-            if not any(f in git_output for f in ('lists/', 'functional_tests.py')):
-                self.fail('no likely files in diff output %s' % (git_output,))
+        if all('/' + l not in git_output for l in LIKELY_FILES) and all(
+            f not in git_output for f in ('lists/', 'functional_tests.py')
+        ):
+            self.fail('no likely files in diff output %s' % (git_output,))
         self.pos += 1
         comment = self.listings[pos + 1]
         if comment.skip:
@@ -823,11 +814,7 @@ def run_interactive_manage_py(self, listing):
                 expected_output = output_before
                 output_after = None
                 next_output = None
-            if user_input == '2':
-                ignore_errors = True
-            else:
-                ignore_errors = False
-
+            ignore_errors = True if user_input == '2' else False
         else:
             user_input = None
             expected_output = output_before

tests/slimerjs-0.9.0/slimerjs.py

@@ -39,7 +39,7 @@ def which(program):
 if SLIMERJSLAUNCHER == "":
     POSSIBLE_PATH = []
 
-    if sys.platform == "linux" or sys.platform == "linux2" or sys.platform == "darwin":
+    if sys.platform in ["linux", "linux2", "darwin"]:
         POSSIBLE_PATH.append(os.path.join(SLIMERJS_PATH, "xulrunner", "xulrunner"))
         path = which('firefox')
         if path != None:
@@ -139,7 +139,7 @@ def showHelp():
     "--reset-profile","--profile","--p","--createprofile","--profilemanager",
 ]
 for arg in SYS_ARGS:
-    if arg == '--help' or arg == "-h":
+    if arg in ['--help', "-h"]:
         showHelp()
         sys.exit(0)
 
@@ -165,8 +165,11 @@ def showHelp():
 os.environ.data['__SLIMER_ARGS'] = string.join(SYS_ARGS,' ')
 
 # launch slimerjs with firefox/xulrunner
-SLCMD = [ SLIMERJSLAUNCHER ]
-SLCMD.extend(["-app", os.path.join(SLIMERJS_PATH, "application.ini"), "-no-remote"])
+SLCMD = [
+    SLIMERJSLAUNCHER,
+    *["-app", os.path.join(SLIMERJS_PATH, "application.ini"), "-no-remote"],
+]
+
 if sys.platform == "win32":
     SLCMD.extend(["-attach-console"])
 SLCMD.extend(PROFILE)
@@ -190,5 +193,5 @@ def showHelp():
 
 if CREATE_TEMP:
     shutil.rmtree(PROFILE_DIR)
-    
+
 sys.exit(exitCode)

tests/source_updater.py

@@ -174,11 +174,10 @@ def find_first_nonimport_line(self):
         except StopIteration:
             return len(self.lines)
         pos = self.lines.index(first_nonimport)
-        if self._import_nodes:
-            if pos < max(n.lineno for n in self._import_nodes):
-                raise SourceUpdateError('first nonimport (%s) was before end of imports (%s)' % (
-                    first_nonimport, max(n.lineno for n in self._import_nodes))
-                )
+        if self._import_nodes and pos < max(n.lineno for n in self._import_nodes):
+            raise SourceUpdateError('first nonimport (%s) was before end of imports (%s)' % (
+                first_nonimport, max(n.lineno for n in self._import_nodes))
+            )
         return pos
 
 

tests/sourcetree.py

@@ -30,17 +30,17 @@ def from_diff(commit_info):
         commit.all_lines = commit.info.split('\n')
 
         commit.lines_to_add = [
-            l[1:] for l in commit.all_lines
-            if l.startswith('+') and
-            l[1:].strip() and
-            not l[1] == '+'
+            l[1:]
+            for l in commit.all_lines
+            if l.startswith('+') and l[1:].strip() and l[1] != '+'
         ]
+
         commit.lines_to_remove = [
-            l[1:] for l in commit.all_lines
-            if l.startswith('-') and
-            l[1:].strip() and
-            not l[1] == '-'
+            l[1:]
+            for l in commit.all_lines
+            if l.startswith('-') and l[1:].strip() and l[1] != '-'
         ]
+
         commit.moved_lines = [
             l for l in commit.lines_to_add if l in commit.lines_to_remove
         ]
@@ -130,7 +130,6 @@ def run_command(self, command, cwd=None, user_input=None, ignore_errors=False, s
                 print(output)
             except io.BlockingIOError as e:
                 print(e)
-                pass
         return output
 
 

tests/test_book_tester.py

@@ -641,8 +641,8 @@ def test_ignores_3_5_x_AssertionError_None_thing(self):
         actual = "AssertionError"
         expected = Output("AssertionError: None")
         self.assert_console_output_correct(actual, expected)
-        actual2 = "AssertionError: something"
         with self.assertRaises(AssertionError):
+            actual2 = "AssertionError: something"
             self.assert_console_output_correct(actual2, expected)
 
 
@@ -662,9 +662,9 @@ def test_ignores_localhost_server_port_5_digits(self):
 
 
     def test_only_ignores_exactly_32_char_strings_no_whitespace(self):
-        actual = "qnslckvp2aga7tm6xuivyb0ob1akzzwl"
         expected = Output("jvhzc8kj2mkh06xooqq9iciptead20qq")
         with self.assertRaises(AssertionError):
+            actual = "qnslckvp2aga7tm6xuivyb0ob1akzzwl"
             self.assert_console_output_correct(actual[:-1], expected[:-1])
             self.assert_console_output_correct(actual + '1', expected + 'a')
             self.assert_console_output_correct(' ' + actual, ' ' + expected)

tests/test_chapter_automate_deployment_with_fabric.py

@@ -21,7 +21,6 @@ def test_listings_and_commands_and_output(self):
 
         self.start_with_checkout()
 
-        vm_restore = 'MAKING_END'
         # hack fast-forward
         skip = False
         if skip:
@@ -31,6 +30,7 @@ def test_listings_and_commands_and_output(self):
             ))
 
         if DO_SERVER_COMMANDS:
+            vm_restore = 'MAKING_END'
             subprocess.check_call(['vagrant', 'snapshot', 'restore', vm_restore])
 
         self.current_server_cd = '~/sites/superlists-staging.ottg.eu'

tests/test_chapter_making_deployment_production_ready.py

@@ -40,8 +40,6 @@ def test_listings_and_commands_and_output(self):
             ' && git reset --hard origin/chapter_making_deployment_production_ready',
         )
 
-        vm_restore = 'MANUAL_END'
-
         # hack fast-forward
         skip = False
         if skip:
@@ -51,6 +49,8 @@ def test_listings_and_commands_and_output(self):
             ))
 
         if DO_SERVER_COMMANDS:
+            vm_restore = 'MANUAL_END'
+
             subprocess.check_call(['vagrant', 'snapshot', 'restore', vm_restore])
 
         self.current_server_cd = '~/sites/$SITENAME'

tests/test_chapter_server_side_debugging.py

@@ -35,8 +35,6 @@ def test_listings_and_commands_and_output(self):
         self.start_with_checkout()
         self.prep_database()
 
-        vm_restore = 'FABRIC_END'
-
         # hack fast-forward
         skip = False
         if skip:
@@ -46,6 +44,8 @@ def test_listings_and_commands_and_output(self):
             ))
 
         if DO_SERVER_COMMANDS:
+            vm_restore = 'FABRIC_END'
+
             subprocess.check_call(['vagrant', 'snapshot', 'restore', vm_restore])
 
         while self.pos < len(self.listings):

tests/test_source_updater.py

@@ -644,7 +644,7 @@ def test_finding_start_line(self):
         assert source.find_start_line(['bla bla', 'whatever']) == 3
         assert source.find_start_line(['indented', 'whatever']) == 4
         assert source.find_start_line(['    indented', 'whatever']) == 4
-        assert source.find_start_line(['no such line', 'whatever']) == None
+        assert source.find_start_line(['no such line', 'whatever']) is None
         with self.assertRaises(SourceUpdateError):
             source.find_start_line([''])
         with self.assertRaises(SourceUpdateError):
@@ -666,8 +666,8 @@ def test_finding_end_line(self):
 
         assert source.find_end_line(['stuff', 'things']) == 1
         assert source.find_end_line(['bla bla', 'whatever', 'more']) == 5
-        assert source.find_end_line(['bla bla', 'whatever']) == None
-        assert source.find_end_line(['no such line', 'whatever']) == None
+        assert source.find_end_line(['bla bla', 'whatever']) is None
+        assert source.find_end_line(['no such line', 'whatever']) is None
         with self.assertRaises(SourceUpdateError):
             source.find_end_line([])
         with self.assertRaises(SourceUpdateError):