Make the code and tests compatible with 3.8-dev.

Author: serhiy-storchaka

pyflakes/checker.py

@@ -1086,7 +1086,7 @@ def ignore(self, node):
         COMPARE = CALL = REPR = ATTRIBUTE = SUBSCRIPT = \
         STARRED = NAMECONSTANT = handleChildren
 
-    NUM = STR = BYTES = ELLIPSIS = ignore
+    NUM = STR = BYTES = ELLIPSIS = CONSTANT = ignore
 
     # "slice" type nodes
     SLICE = EXTSLICE = INDEX = handleChildren

pyflakes/reporter.py

@@ -53,15 +53,16 @@ def syntaxError(self, filename, msg, lineno, offset, text):
         """
         line = text.splitlines()[-1]
         if offset is not None:
-            offset = offset - (len(text) - len(line))
+            if sys.version_info < (3, 8):
+                offset = offset - (len(text) - len(line)) + 1
             self._stderr.write('%s:%d:%d: %s\n' %
-                               (filename, lineno, offset + 1, msg))
+                               (filename, lineno, offset, msg))
         else:
             self._stderr.write('%s:%d: %s\n' % (filename, lineno, msg))
         self._stderr.write(line)
         self._stderr.write('\n')
         if offset is not None:
-            self._stderr.write(re.sub(r'\S', ' ', line[:offset]) +
+            self._stderr.write(re.sub(r'\S', ' ', line[:offset - 1]) +
                                "^\n")
 
     def flake(self, message):

pyflakes/test/test_api.py

@@ -257,7 +257,9 @@ def test_syntaxError(self):
         """
         err = StringIO()
         reporter = Reporter(None, err)
-        reporter.syntaxError('foo.py', 'a problem', 3, 7, 'bad line of source')
+        reporter.syntaxError('foo.py', 'a problem', 3,
+                             8 if sys.version_info >= (3, 8) else 7,
+                             'bad line of source')
         self.assertEqual(
             ("foo.py:3:8: a problem\n"
              "bad line of source\n"
@@ -292,10 +294,11 @@ def test_multiLineSyntaxError(self):
         reporter = Reporter(None, err)
         reporter.syntaxError('foo.py', 'a problem', 3, len(lines[0]) + 7,
                              '\n'.join(lines))
+        column = 25 if sys.version_info >= (3, 8) else 7
         self.assertEqual(
-            ("foo.py:3:7: a problem\n" +
+            ("foo.py:3:%d: a problem\n" % column +
              lines[-1] + "\n" +
-             "      ^\n"),
+             " " * (column - 1) + "^\n"),
             err.getvalue())
 
     def test_unexpectedError(self):
@@ -424,13 +427,14 @@ def evaluate(source):
             else:
                 message = 'invalid syntax'
 
+            column = 8 if sys.version_info >= (3, 8) else 11
             self.assertHasErrors(
                 sourcePath,
                 ["""\
-%s:8:11: %s
+%s:8:%d: %s
     '''quux'''
-          ^
-""" % (sourcePath, message)])
+%s^
+""" % (sourcePath, column, message, ' ' * (column - 1))])
 
     def test_eofSyntaxError(self):
         """
@@ -483,14 +487,18 @@ def foo(bar=baz, bax):
     pass
 """
         with self.makeTempFile(source) as sourcePath:
-            last_line = '       ^\n' if ERROR_HAS_LAST_LINE else ''
-            column = '8:' if ERROR_HAS_COL_NUM else ''
+            if ERROR_HAS_LAST_LINE:
+                column = 9 if sys.version_info >= (3, 8) else 8
+                last_line = ' ' * (column - 1) + '^\n'
+                columnstr = '%d:' % column
+            else:
+                last_line = columnstr = ''
             self.assertHasErrors(
                 sourcePath,
                 ["""\
 %s:1:%s non-default argument follows default argument
 def foo(bar=baz, bax):
-%s""" % (sourcePath, column, last_line)])
+%s""" % (sourcePath, columnstr, last_line)])
 
     def test_nonKeywordAfterKeywordSyntaxError(self):
         """
@@ -502,8 +510,12 @@ def test_nonKeywordAfterKeywordSyntaxError(self):
 foo(bar=baz, bax)
 """
         with self.makeTempFile(source) as sourcePath:
-            last_line = '            ^\n' if ERROR_HAS_LAST_LINE else ''
-            column = '13:' if ERROR_HAS_COL_NUM else ''
+            if ERROR_HAS_LAST_LINE:
+                column = 14 if sys.version_info >= (3, 8) else 13
+                last_line = ' ' * (column - 1) + '^\n'
+                columnstr = '%d:' % column
+            else:
+                last_line = columnstr = ''
 
             if sys.version_info >= (3, 5):
                 message = 'positional argument follows keyword argument'
@@ -515,7 +527,7 @@ def test_nonKeywordAfterKeywordSyntaxError(self):
                 ["""\
 %s:1:%s %s
 foo(bar=baz, bax)
-%s""" % (sourcePath, column, message, last_line)])
+%s""" % (sourcePath, columnstr, message, last_line)])
 
     def test_invalidEscape(self):
         """

pyflakes/test/test_doctests.py

@@ -328,7 +328,10 @@ def doctest_stuff():
             m.DoctestSyntaxError).messages
         exc = exceptions[0]
         self.assertEqual(exc.lineno, 4)
-        self.assertEqual(exc.col, 26)
+        if sys.version_info >= (3, 8):
+            self.assertEqual(exc.col, 18)
+        else:
+            self.assertEqual(exc.col, 26)
 
         # PyPy error column offset is 0,
         # for the second and third line of the doctest
@@ -341,7 +344,7 @@ def doctest_stuff():
             self.assertEqual(exc.col, 16)
         exc = exceptions[2]
         self.assertEqual(exc.lineno, 6)
-        if PYPY:
+        if PYPY or sys.version_info >= (3, 8):
             self.assertEqual(exc.col, 13)
         else:
             self.assertEqual(exc.col, 18)
@@ -355,7 +358,7 @@ def doctest_stuff():
             """
         ''', m.DoctestSyntaxError).messages[0]
         self.assertEqual(exc.lineno, 5)
-        if PYPY:
+        if PYPY or sys.version_info >= (3, 8):
             self.assertEqual(exc.col, 13)
         else:
             self.assertEqual(exc.col, 16)