Fix PyPy2 Windows IntegrationTests

.appveyor.yml

@@ -1,8 +1,46 @@
 # To activate, change the Appveyor settings to use `.appveyor.yml`.
 install:
- - python -m pip install tox
+ - python -m pip install --upgrade virtualenv pip setuptools tox
+
+ # Fetch the three main PyPy releases
+ - ps: (New-Object Net.WebClient).DownloadFile('https://bitbucket.org/pypy/pypy/downloads/pypy-2.6.1-win32.zip', "$env:appveyor_build_folder\pypy-2.6.1-win32.zip")
+ - ps: 7z x pypy-2.6.1-win32.zip | Out-Null
+ - move pypy-2.6.1-win32 C:\
+
+ - ps: (New-Object Net.WebClient).DownloadFile('https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.3.1-win32.zip', "$env:appveyor_build_folder\pypy2-v5.3.1-win32.zip")
+ - 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:\
+
+ # 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
+
+ # 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
+
+ # 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.
+ - ps: $env:path = "$env:path;C:\pypy2-v5.3.1-win32"
+
+ # 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")
+ - git clone https://github.com/pypa/setuptools/
+ - cd setuptools
+ - C:\pypy3-2.4.0-win32\pypy3 bootstrap.py
+ - C:\pypy3-2.4.0-win32\pypy3 setup.py install
+ - C:\pypy-2.6.1-win32\pypy bootstrap.py
+ - C:\pypy-2.6.1-win32\pypy setup.py install
+ - cd ..
 
 build: off
 
 test_script:
  - python -m tox
+ - C:\pypy3-2.4.0-win32\pypy3 setup.py test -q
+ - C:\pypy-2.6.1-win32\pypy setup.py test -q

pyflakes/test/test_api.py

@@ -8,6 +8,7 @@
 import subprocess
 import tempfile
 
+from pyflakes.checker import PY2
 from pyflakes.messages import UnusedImport
 from pyflakes.reporter import Reporter
 from pyflakes.api import (
@@ -30,6 +31,12 @@
 except AttributeError:
  PYPY = False
 
+try:
+ WindowsError
+ WIN = True
+except NameError:
+ WIN = False
+
 ERROR_HAS_COL_NUM = ERROR_HAS_LAST_LINE = sys.version_info >= (3, 2) or PYPY
 
 
@@ -661,6 +668,9 @@ def runPyflakes(self, paths, stdin=None):
  if sys.version_info >= (3,):
  stdout = stdout.decode('utf-8')
  stderr = stderr.decode('utf-8')
+ # Workaround https://bitbucket.org/pypy/pypy/issues/2350
+ if PYPY and PY2 and WIN:
+ stderr = stderr.replace('\r\r\n', '\r\n')
  return (stdout, stderr, rv)
 
  def test_goodFile(self):
@@ -685,7 +695,7 @@ def test_fileWithFlakes(self):
  expected = UnusedImport(self.tempfilepath, Node(1), 'contraband')
  self.assertEqual(d, ("%s%s" % (expected, os.linesep), '', 1))
 
- def test_errors(self):
+ def test_errors_io(self):
  """
  When pyflakes finds errors with the files it's given, (if they don't
  exist, say), then the return code is non-zero and the errors are
@@ -696,6 +706,20 @@ def test_errors(self):
  os.linesep)
  self.assertEqual(d, ('', error_msg, 1))
 
+ def test_errors_syntax(self):
+ """
+ When pyflakes finds errors with the files it's given, (if they don't
+ exist, say), then the return code is non-zero and the errors are
+ printed to stderr.
+ """
+ fd = open(self.tempfilepath, 'wb')
+ fd.write("import".encode('ascii'))
+ fd.close()
+ d = self.runPyflakes([self.tempfilepath])
+ error_msg = '{0}:1:{2}: invalid syntax{1}import{1} {3}^{1}'.format(
+ self.tempfilepath, os.linesep, 5 if PYPY else 7, '' if PYPY else ' ')
+ self.assertEqual(d, ('', error_msg, True))
+
  def test_readFromStdin(self):
  """
  If no arguments are passed to C{pyflakes} then it reads from stdin.