Merge fixes from erikkemberman@

Removes Python 2 support as well as dependency on py; fixes #81 #82

.travis.yml

@@ -3,10 +3,6 @@ language: python
 cache: pip
 matrix:
   include:
-    - python: 2.7
-      env: TOXENV=py27
-    - python: 3.4
-      env: TOXENV=py34
     - python: 3.5
       env: TOXENV=py35
     - python: 3.6
@@ -19,8 +15,10 @@ matrix:
       env: TOXENV=py37
     - python: 3.8
       env: TOXENV=py38
-    - python: pypy2.7-6.0
-      env: TOXENV=pypy
+    - python: 3.9
+      env: TOXENV=py39
+    - python: 3.10
+      env: TOXENV=py310
     - python: pypy3.5-6.0
       env: TOXENV=pypy3
 install:

pytest_flake8.py

@@ -2,12 +2,12 @@
 
 import os
 import re
+from contextlib import redirect_stdout, redirect_stderr
+from io import BytesIO, TextIOWrapper
 
 from flake8.main import application
 from flake8.options import config
 
-import py
-
 import pytest
 
 __version__ = '0.6'
@@ -116,15 +116,22 @@ def setup(self):
             pytest.skip("file(s) previously passed FLAKE8 checks")
 
     def runtest(self):
-        call = py.io.StdCapture.call
-        found_errors, out, err = call(
-            check_file,
-            self.fspath,
-            self.flake8ignore,
-            self.maxlength,
-            self.maxcomplexity,
-            self.showshource,
-            self.statistics)
+        with BytesIO() as bo, TextIOWrapper(bo, encoding='utf-8') as to, \
+             BytesIO() as be, TextIOWrapper(be, encoding='utf-8') as te, \
+             redirect_stdout(to), redirect_stderr(te):
+            found_errors = check_file(
+                self.fspath,
+                self.flake8ignore,
+                self.maxlength,
+                self.maxcomplexity,
+                self.showshource,
+                self.statistics
+            )
+            to.flush()
+            te.flush()
+            out = bo.getvalue().decode('utf-8')
+            err = be.getvalue().decode('utf-8')
+
         if found_errors:
             raise Flake8Error(out, err)
         # update mtime only if test passed

setup.py

@@ -14,13 +14,13 @@
         "Intended Audience :: Developers",
         "License :: OSI Approved :: BSD License",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Topic :: Software Development",

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist=py27,py36-pytesttrunk,py36-xdist,py34,py35,py36,py37,py38,pypy,pypy3
+envlist=py36-pytesttrunk,py36-xdist,py35,py36,py37,py38,py39,py310,pypy3
 
 [testenv]
 deps=pytest