Merge pull request #627 from MinekPo1/master

Add support for ignoring W191.

autopep8.py

@@ -1661,9 +1661,9 @@ def get_item(items, index, default=None):
     return default
 
 
-def reindent(source, indent_size):
+def reindent(source, indent_size, leave_tabs=False):
     """Reindent all lines."""
-    reindenter = Reindenter(source)
+    reindenter = Reindenter(source, leave_tabs)
     return reindenter.run(indent_size)
 
 
@@ -3020,7 +3020,7 @@ class Reindenter(object):
 
     """
 
-    def __init__(self, input_text):
+    def __init__(self, input_text, leave_tabs=False):
         sio = io.StringIO(input_text)
         source_lines = sio.readlines()
 
@@ -3037,10 +3037,16 @@ def __init__(self, input_text):
             else:
                 # Only expand leading tabs.
                 with_rstrip = line_number != len(source_lines)
-                self.lines.append(
-                    _get_indentation(line).expandtabs() +
-                    _remove_leading_and_normalize(line, with_rstrip)
-                )
+                if leave_tabs:
+                    self.lines.append(
+                        _get_indentation(line) +
+                        _remove_leading_and_normalize(line, with_rstrip)
+                    )
+                else:
+                    self.lines.append(
+                        _get_indentation(line).expandtabs() +
+                        _remove_leading_and_normalize(line, with_rstrip)
+                    )
 
         self.lines.insert(0, None)
         self.index = 1  # index into self.lines of next line
@@ -3689,7 +3695,14 @@ def apply_global_fixes(source, options, where='global', filename='',
     if any(code_match(code, select=options.select, ignore=options.ignore)
            for code in ['E101', 'E111']):
         source = reindent(source,
-                          indent_size=options.indent_size)
+                          indent_size=options.indent_size,
+                          leave_tabs=not(
+                              code_match(
+                                    'W191',
+                                    select=options.select,
+                                    ignore=options.ignore)
+                                         )
+                          )
 
     for (code, function) in global_fixes():
         if code.upper() in SELECTED_GLOBAL_FIXED_METHOD_CODES \

test/test_autopep8.py

@@ -1810,6 +1810,16 @@ def test_w191(self):
         with autopep8_context(line, options=['--aggressive']) as result:
             self.assertEqual(fixed, result)
 
+    def test_w191_ignore(self):
+        line = """\
+while True:
+\tif True:
+\t\t1
+"""
+        with autopep8_context(line, options=['--aggressive', '--ignore=W191']) as result:
+            self.assertEqual(line, result)
+
+
     def test_e131_with_select_option(self):
         line = 'd = f(\n    a="hello"\n        "world",\n    b=1)\n'
         fixed = 'd = f(\n    a="hello"\n    "world",\n    b=1)\n'
@@ -5826,6 +5836,7 @@ def test_parallel_jobs_with_diff_option(self):
                           ['--jobs=3', '--diff'], stdout=PIPE)
                 p.wait()
                 output = p.stdout.read().decode()
+                output = output.replace("\r\n","\n")  # windows compatibility
                 p.stdout.close()
 
                 actual_diffs = []
@@ -5834,9 +5845,9 @@ def test_parallel_jobs_with_diff_option(self):
 --- original/{filename}
 +++ fixed/{filename}
 @@ -1 +1 @@
--'abc'  
+-'abc'  {blank}
 +'abc'
-""".format(filename=filename))
+""".format(filename=filename, blank=""))  # in case the users IDE trims leaning whitespace
                 self.assertEqual(p.returncode, autopep8.EXIT_CODE_OK)
                 for actual_diff in actual_diffs:
                     self.assertIn(actual_diff, output)