Merge pull request #442 from hhatto/fix-w504

fix w504 with any other tokenize.OP

Author: hhatto

autopep8.py

@@ -1278,7 +1278,10 @@ def fix_w504(self, result):
             newline_count = 0
             newline_index = []
             for index, t in enumerate(ts):
-                if t[0] == tokenize.OP:
+                if t[0] == tokenize.OP and t[1] not in ".,(){}":
+                    if t[2][0] == 1 and t[3][0] == 1:
+                        operator_position = (t[2][1], t[3][1])
+                elif t[0] == tokenize.NAME and t[1] in ("and", "or"):
                     if t[2][0] == 1 and t[3][0] == 1:
                         operator_position = (t[2][1], t[3][1])
                 elif t[0] in (tokenize.NEWLINE, tokenize.NL):

test/test_autopep8.py

@@ -4364,6 +4364,25 @@ def test_w504(self):
         with autopep8_context(line, options=['--select=W504', '--ignore=E']) as result:
             self.assertEqual(fixed, result)
 
+    def test_w504_with_e265_ignore_option(self):
+        line = '(width == 0 +\n height == 0)\n'
+        with autopep8_context(line, options=['--ignore=E265']) as result:
+            self.assertEqual(line, result)
+
+    def test_w504_with_e265_ignore_option_regression(self):
+        line = """\
+if True:
+    if True:
+        if (
+                link.is_wheel and
+                isinstance(link.comes_from, HTMLPage) and
+                link.comes_from.url.startswith(index_url)
+        ):
+            _store_wheel_in_cache(file_path, index_url)
+"""
+        with autopep8_context(line, options=['--ignore=E265']) as result:
+            self.assertEqual(line, result)
+
     @unittest.skip('TODO')
     def test_w504_with_line_comment(self):
         line = '(width == 0 +\n # this is comment\n height == 0)\n'