summaryrefslogtreecommitdiff
path: root/pyflakes/test/test_doctests.py
diff options
context:
space:
mode:
Diffstat (limited to 'pyflakes/test/test_doctests.py')
-rw-r--r--pyflakes/test/test_doctests.py19
1 files changed, 5 insertions, 14 deletions
diff --git a/pyflakes/test/test_doctests.py b/pyflakes/test/test_doctests.py
index 197e7fb..6c8e69e 100644
--- a/pyflakes/test/test_doctests.py
+++ b/pyflakes/test/test_doctests.py
@@ -323,9 +323,7 @@ class Test(TestCase):
m.DoctestSyntaxError).messages
exc = exceptions[0]
self.assertEqual(exc.lineno, 4)
- if PYPY:
- self.assertEqual(exc.col, 27)
- elif sys.version_info >= (3, 8):
+ if not PYPY and sys.version_info >= (3, 8):
self.assertEqual(exc.col, 18)
else:
self.assertEqual(exc.col, 26)
@@ -336,14 +334,12 @@ class Test(TestCase):
exc = exceptions[1]
self.assertEqual(exc.lineno, 5)
if PYPY:
- self.assertEqual(exc.col, 14)
+ self.assertEqual(exc.col, 13)
else:
self.assertEqual(exc.col, 16)
exc = exceptions[2]
self.assertEqual(exc.lineno, 6)
- if PYPY:
- self.assertEqual(exc.col, 14)
- elif sys.version_info >= (3, 8):
+ if PYPY or sys.version_info >= (3, 8):
self.assertEqual(exc.col, 13)
else:
self.assertEqual(exc.col, 18)
@@ -357,9 +353,7 @@ class Test(TestCase):
"""
''', m.DoctestSyntaxError).messages[0]
self.assertEqual(exc.lineno, 5)
- if PYPY:
- self.assertEqual(exc.col, 14)
- elif sys.version_info >= (3, 8):
+ if PYPY or sys.version_info >= (3, 8):
self.assertEqual(exc.col, 13)
else:
self.assertEqual(exc.col, 16)
@@ -378,10 +372,7 @@ class Test(TestCase):
m.DoctestSyntaxError,
m.UndefinedName).messages
self.assertEqual(exc1.lineno, 6)
- if PYPY:
- self.assertEqual(exc1.col, 20)
- else:
- self.assertEqual(exc1.col, 19)
+ self.assertEqual(exc1.col, 19)
self.assertEqual(exc2.lineno, 7)
self.assertEqual(exc2.col, 12)