Merge 0982be5 into 19f4fcf

hhatto · May 21, 2020 · 98f97d5 · 98f97d5
2 parents 19f4fcf + 0982be5
commit 98f97d5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/autopep8.py b/autopep8.py
@@ -4363,7 +4363,12 @@ def main(argv=None, apply_config=True):
                 assert len(args.files) == 1
                 assert not args.recursive
 
-            ret = fix_multiple_files(args.files, args, sys.stdout)
+            results = fix_multiple_files(args.files, args, sys.stdout)
+            if args.diff:
+                ret = any([len(ret) != 0 for ret in results])
+            else:
+                # with in-place option
+                ret = any([ret is not None for ret in results])
             if args.exit_code and ret:
                 return EXIT_CODE_EXISTS_DIFF
     except KeyboardInterrupt:

diff --git a/test/test_autopep8.py b/test/test_autopep8.py
@@ -5244,6 +5244,12 @@ def test_non_diff_with_exit_code_option(self):
             self.assertEqual('', '\n'.join(result.split('\n')[3:]))
             self.assertEqual(retcode, autopep8.EXIT_CODE_OK)
 
+    def test_non_diff_with_exit_code_and_jobs_options(self):
+        line = "'abc'\n"
+        with autopep8_subprocess(line, ['-j0', '--diff', '--exit-code']) as (result, retcode):
+            self.assertEqual('', '\n'.join(result.split('\n')[3:]))
+            self.assertEqual(retcode, autopep8.EXIT_CODE_OK)
+
     def test_diff_with_empty_file(self):
         with autopep8_subprocess('', ['--diff']) as (result, retcode):
             self.assertEqual('\n'.join(result.split('\n')[3:]), '')