Drop support for EOL Python <2.7 and 3.2-3.3 (#322)

* Ignore JetBrains/PyCharm project files

* Drop support for EOL Python <2.7, 3.2-3.3

* Replace function call with set literal

* Drop pypy3.3-5.2-alpha1 as it's based on EOL Python 3.3.5

* PY32 and PY33 are now essentially equal to PY2

* Upgrade pypy3-2.4.0 (Python 3.2.5) to pypy3-v5.10.0 (Python 3.5.3)

* Comment out failing pypy3-v5.10.0 until pypy3-v5.10.1 is released

* Revert "Ignore JetBrains/PyCharm project files"

This reverts commit 99f1d96.

Author: hugovk

.appveyor.yml

@@ -13,18 +13,21 @@ install:
   - ps: 7z x pypy2-v5.3.1-win32.zip | Out-Null
   - move pypy2-v5.3.1-win32 C:\
 
-  - ps: (New-Object Net.WebClient).DownloadFile('https://bitbucket.org/pypy/pypy/downloads/pypy3-2.4.0-win32.zip', "$env:appveyor_build_folder\pypy3-2.4.0-win32.zip")
-  - ps: 7z x pypy3-2.4.0-win32.zip | Out-Null
-  - move pypy3-2.4.0-win32 C:\
+  # Note: pypy3-v5.10.0 is commented out as it needs an updated pip to
+  # recognise the new python_requires, but there's a pypy bug preventing that.
+  # It's been fixed and will be in the next 5.10.1 release.
+  # See https://bitbucket.org/pypy/pypy/issues/2720/ensurepip-on-pypy-c-jit-93579-a4194a67868f
+  # and https://stackoverflow.com/q/47999518/724176.
 
-  # pypy3 installer provides 'pypy.exe', not pypy3.exe.
-  - copy C:\pypy3-2.4.0-win32\pypy.exe C:\pypy3-2.4.0-win32\pypy3.exe
+#  - ps: (New-Object Net.WebClient).DownloadFile('https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.10.0-win32.zip', "$env:appveyor_build_folder\pypy3-v5.10.0-win32.zip")
+#  - ps: 7z x pypy3-v5.10.0-win32.zip | Out-Null
+#  - move pypy3-v5.10.0-win32 C:\
 
   # workaround https://github.com/pypa/virtualenv/issues/93
   - mkdir C:\python33\tcl\tcl8.6
   - mkdir C:\python33\tcl\tk8.6
-  - mkdir C:\pypy3-2.4.0-win32\tcl\tcl8.6
-  - mkdir C:\pypy3-2.4.0-win32\tcl\tk8.6
+#  - mkdir C:\pypy3-v5.10.0-win32\tcl\tcl8.6
+#  - mkdir C:\pypy3-v5.10.0-win32\tcl\tk8.6
 
   # Only pypy2-5.3.1 is integrated into tox, as pypy3-2.4.0 fails and
   # a Windows distribution of pypy3-5.2 isnt available yet.
@@ -33,14 +36,13 @@ install:
   # pypy3-2.4.0 and pypy-2.6.1 are manually bootstrapped and tested
   - ps: (New-Object Net.WebClient).DownloadFile('https://bootstrap.pypa.io/get-pip.py', "$env:appveyor_build_folder\get-pip.py")
   # errors are ignored due to https://github.com/pypa/pip/issues/2669#issuecomment-136405390
-  # NOTE: If and when a new version of PyPy3 is released for Windows that
-  #       supports anything newer than Python 3.2, remove the setuptools pin.
-  - ps: C:\pypy3-2.4.0-win32\pypy3 "$env:appveyor_build_folder\get-pip.py"; C:\pypy3-2.4.0-win32\pypy3 -m pip install -U --force-reinstall pip==8.1.2 "setuptools<30"; echo "ignore error"
+#  - ps: C:\pypy3-v5.10.0-win32\pypy3 "$env:appveyor_build_folder\get-pip.py"; echo "ignore error"
+#  - ps: C:\pypy3-v5.10.0-win32\pypy3 -m pip install -U --force-reinstall pip setuptools; echo "ignore error"
   - ps: C:\pypy-2.6.1-win32\pypy "$env:appveyor_build_folder\get-pip.py"
 
 build: off
 
 test_script:
   - python -m tox
-  - C:\pypy3-2.4.0-win32\pypy3 setup.py test -q
+#  - C:\pypy3-v5.10.0-win32\pypy3 setup.py test -q
   - C:\pypy-2.6.1-win32\pypy setup.py test -q

.travis.yml

@@ -1,17 +1,14 @@
 language: python
 cache: pip
 python:
-  - 2.6
   - 2.7
-  - 3.3
   - 3.4
   - 3.5
   - 3.6
   - nightly
   - pypy
   - pypy-5.3
   - pypy3
-  - pypy3.3-5.2-alpha1
 install:
   - pip install --upgrade .
   - pip list

README.rst

@@ -9,7 +9,7 @@ parsing the source file, not importing it, so it is safe to use on
 modules with side effects.  It's also much faster.
 
 It is `available on PyPI <https://pypi.python.org/pypi/pyflakes>`_
-and it supports all active versions of Python from 2.5 to 3.6.
+and it supports all active versions of Python: 2.7 and 3.4 to 3.6.
 
 
 

pyflakes/__main__.py

@@ -1,5 +1,5 @@
 from pyflakes.api import main
 
-# python -m pyflakes (with Python >= 2.7)
+# python -m pyflakes
 if __name__ == '__main__':
     main(prog='pyflakes')

pyflakes/api.py

@@ -89,19 +89,8 @@ def checkPath(filename, reporter=None):
     if reporter is None:
         reporter = modReporter._makeDefaultReporter()
     try:
-        # in Python 2.6, compile() will choke on \r\n line endings. In later
-        # versions of python it's smarter, and we want binary mode to give
-        # compile() the best opportunity to do the right thing WRT text
-        # encodings.
-        if sys.version_info < (2, 7):
-            mode = 'rU'
-        else:
-            mode = 'rb'
-
-        with open(filename, mode) as f:
+        with open(filename, 'rb') as f:
             codestr = f.read()
-        if sys.version_info < (2, 7):
-            codestr += '\n'     # Work around for Python <= 2.6
     except UnicodeError:
         reporter.unexpectedError(filename, 'problem decoding source')
         return 1

pyflakes/checker.py

@@ -5,14 +5,13 @@
 Also, it models the Bindings and Scopes.
 """
 import __future__
+import ast
 import doctest
 import os
 import sys
 
 PY2 = sys.version_info < (3, 0)
-PY32 = sys.version_info < (3, 3)    # Python 2.5 to 3.2
-PY33 = sys.version_info < (3, 4)    # Python 2.5 to 3.3
-PY34 = sys.version_info < (3, 5)    # Python 2.5 to 3.4
+PY34 = sys.version_info < (3, 5)    # Python 2.7 to 3.4
 try:
     sys.pypy_version_info
     PYPY = True
@@ -21,16 +20,6 @@
 
 builtin_vars = dir(__import__('__builtin__' if PY2 else 'builtins'))
 
-try:
-    import ast
-except ImportError:     # Python 2.5
-    import _ast as ast
-
-    if 'decorator_list' not in ast.ClassDef._fields:
-        # Patch the missing attribute 'decorator_list'
-        ast.ClassDef.decorator_list = ()
-        ast.FunctionDef.decorator_list = property(lambda s: s.decorators)
-
 from pyflakes import messages
 
 
@@ -53,7 +42,7 @@ def get_raise_argument(node):
     unicode = str
 
 # Python >= 3.3 uses ast.Try instead of (ast.TryExcept + ast.TryFinally)
-if PY32:
+if PY2:
     def getAlternatives(n):
         if isinstance(n, (ast.If, ast.TryFinally)):
             return [n.body]
@@ -138,7 +127,7 @@ def convert_to_value(item):
             result.name,
             result,
         )
-    elif (not PY33) and isinstance(item, ast.NameConstant):
+    elif (not PY2) and isinstance(item, ast.NameConstant):
         # None, True, False are nameconstants in python3, but names in 2
         return item.value
     else:
@@ -421,8 +410,8 @@ class FunctionScope(Scope):
     @ivar globals: Names declared 'global' in this function.
     """
     usesLocals = False
-    alwaysUsed = set(['__tracebackhide__',
-                      '__traceback_info__', '__traceback_supplement__'])
+    alwaysUsed = {'__tracebackhide__', '__traceback_info__',
+                  '__traceback_supplement__'}
 
     def __init__(self):
         super(FunctionScope, self).__init__()
@@ -1206,9 +1195,9 @@ def addArgs(arglist):
             wildcard = getattr(node.args, arg_name)
             if not wildcard:
                 continue
-            args.append(wildcard if PY33 else wildcard.arg)
+            args.append(wildcard if PY2 else wildcard.arg)
             if is_py3_func:
-                if PY33:  # Python 2.5 to 3.3
+                if PY2:  # Python 2.7
                     argannotation = arg_name + 'annotation'
                     annotations.append(getattr(node.args, argannotation))
                 else:     # Python >= 3.4
@@ -1249,7 +1238,7 @@ def checkUnusedAssignments():
                     self.report(messages.UnusedVariable, binding.source, name)
             self.deferAssignment(checkUnusedAssignments)
 
-            if PY32:
+            if PY2:
                 def checkReturnWithArgumentInsideGenerator():
                     """
                     Check to see if there is any return statement with

pyflakes/test/harness.py

@@ -1,18 +1,13 @@
 
-import sys
 import textwrap
 import unittest
 
 from pyflakes import checker
 
 __all__ = ['TestCase', 'skip', 'skipIf']
 
-if sys.version_info < (2, 7):
-    skip = lambda why: (lambda func: 'skip')  # not callable
-    skipIf = lambda cond, why: (skip(why) if cond else lambda func: func)
-else:
-    skip = unittest.skip
-    skipIf = unittest.skipIf
+skip = unittest.skip
+skipIf = unittest.skipIf
 PyCF_ONLY_AST = 1024
 
 

pyflakes/test/test_dict.py

@@ -19,15 +19,11 @@ def test_duplicate_keys(self):
 
     @skipIf(version_info < (3,),
             "bytes and strings with same 'value' are not equal in python3")
-    @skipIf(version_info[0:2] == (3, 2),
-            "python3.2 does not allow u"" literal string definition")
     def test_duplicate_keys_bytes_vs_unicode_py3(self):
         self.flakes("{b'a': 1, u'a': 2}")
 
     @skipIf(version_info < (3,),
             "bytes and strings with same 'value' are not equal in python3")
-    @skipIf(version_info[0:2] == (3, 2),
-            "python3.2 does not allow u"" literal string definition")
     def test_duplicate_values_bytes_vs_unicode_py3(self):
         self.flakes(
             "{1: b'a', 1: u'a'}",

pyflakes/test/test_imports.py

@@ -569,16 +569,15 @@ def test_usedInExcept(self):
         ''')
 
     def test_redefinedByExcept(self):
-        as_exc = ', ' if version_info < (2, 6) else ' as '
         expected = [m.RedefinedWhileUnused]
         if version_info >= (3,):
             # The exc variable is unused inside the exception handler.
             expected.append(m.UnusedVariable)
         self.flakes('''
         import fu
         try: pass
-        except Exception%sfu: pass
-        ''' % as_exc, *expected)
+        except Exception as fu: pass
+        ''', *expected)
 
     def test_usedInRaise(self):
         self.flakes('''
@@ -1149,13 +1148,6 @@ def f():
             return "hello"
         ''', m.UndefinedName)
 
-
-class Python26Tests(TestCase):
-    """
-    Tests for checking of syntax which is valid in Python 2.6 and newer.
-    """
-
-    @skipIf(version_info < (2, 6), "Python >= 2.6 only")
     def test_usedAsClassDecorator(self):
         """
         Using an imported name as a class decorator results in no warnings,

pyflakes/test/test_other.py

@@ -81,7 +81,6 @@ def f():
         (1 for a, b in [(1, 2)])
         ''')
 
-    @skipIf(version_info < (2, 7), "Python >= 2.7 only")
     def test_redefinedInSetComprehension(self):
         """
         Test that reusing a variable in a set comprehension does not raise
@@ -111,7 +110,6 @@ def f():
         {1 for a, b in [(1, 2)]}
         ''')
 
-    @skipIf(version_info < (2, 7), "Python >= 2.7 only")
     def test_redefinedInDictComprehension(self):
         """
         Test that reusing a variable in a dict comprehension does not raise
@@ -279,7 +277,6 @@ def a(): pass
             a = classmethod(a)
         ''')
 
-    @skipIf(version_info < (2, 6), "Python >= 2.6 only")
     def test_modernProperty(self):
         self.flakes("""
         class A:
@@ -1584,7 +1581,6 @@ def test_withStatementUndefinedInExpression(self):
             pass
         ''', m.UndefinedName)
 
-    @skipIf(version_info < (2, 7), "Python >= 2.7 only")
     def test_dictComprehension(self):
         """
         Dict comprehensions are properly handled.
@@ -1593,7 +1589,6 @@ def test_dictComprehension(self):
         a = {1: x for x in range(10)}
         ''')
 
-    @skipIf(version_info < (2, 7), "Python >= 2.7 only")
     def test_setComprehensionAndLiteral(self):
         """
         Set comprehensions are properly handled.
@@ -1604,17 +1599,16 @@ def test_setComprehensionAndLiteral(self):
         ''')
 
     def test_exceptionUsedInExcept(self):
-        as_exc = ', ' if version_info < (2, 6) else ' as '
         self.flakes('''
         try: pass
-        except Exception%se: e
-        ''' % as_exc)
+        except Exception as e: e
+        ''')
 
         self.flakes('''
         def download_review():
             try: pass
-            except Exception%se: e
-        ''' % as_exc)
+            except Exception as e: e
+        ''')
 
     @skipIf(version_info < (3,),
             "In Python 2 exception names stay bound after the exception handler")
@@ -1625,12 +1619,11 @@ def test_exceptionUnusedInExcept(self):
         ''', m.UnusedVariable)
 
     def test_exceptionUnusedInExceptInFunction(self):
-        as_exc = ', ' if version_info < (2, 6) else ' as '
         self.flakes('''
         def download_review():
             try: pass
-            except Exception%se: pass
-        ''' % as_exc, m.UnusedVariable)
+            except Exception as e: pass
+        ''', m.UnusedVariable)
 
     def test_exceptWithoutNameInFunction(self):
         """