[gentoo-commits] repo/gentoo:master commit in: dev-python/pyflakes/, dev-python/pyflakes/files/
commit: 105526069f1c27b9d4f348b6a917d8280ece74fb
Author: Michał Górny gentoo org>
AuthorDate: Sat Sep 2 02:53:16 2023 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Sep 2 02:53:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10552606
dev-python/pyflakes: Remove old
Signed-off-by: Michał Górny gentoo.org>
dev-python/pyflakes/Manifest | 1 -
.../pyflakes/files/pyflakes-3.0.1-python3.11.patch | 38 --
dev-python/pyflakes/pyflakes-3.0.1-r1.ebuild | 25 --
3 files changed, 64 deletions(-)
diff --git a/dev-python/pyflakes/Manifest b/dev-python/pyflakes/Manifest
index 49d6006afee4..d41a6df6e299 100644
--- a/dev-python/pyflakes/Manifest
+++ b/dev-python/pyflakes/Manifest
@@ -1,2 +1 @@
-DIST pyflakes-3.0.1.tar.gz 63554 BLAKE2B
992dc4c81204c9ae2fd44744452e76a11209552edaef930edb14b7ba4763720cd1c0c0cd148fa7edd474b33aa529d8ec28f7f35a2b02b707d58cf70243fc13a9
SHA512
10ffe2b92f3885d40578452423a93609f8546b2392997bdbc3f64ca0094516ce6b8449e5d3675bda5fdbc16190c89be23609559fc4cd4f1c97e6af032226d7b7
DIST pyflakes-3.1.0.tar.gz 63636 BLAKE2B
89e5fae6bba9efc820e348ddac37fd8590478c64363a5f295cc620ebbc7b51d4d51e0cff30b6a54ee573612e5309d7fff9462bc31c9e89c34cf7cdbecffabd30
SHA512
6277eaa82a3d94f8052b3da865cfcc8e99846738b5869fca1be92bb5b9a4db0088859d811da565200e640ad0555d46e0ebcaf831cd422b84304514592270b02e
diff --git a/dev-python/pyflakes/files/pyflakes-3.0.1-python3.11.patch
b/dev-python/pyflakes/files/pyflakes-3.0.1-python3.11.patch
deleted file mode 100644
index db804f42c775..
--- a/dev-python/pyflakes/files/pyflakes-3.0.1-python3.11.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://github.com/PyCQA/pyflakes/commit/836631f2f73d45baa4021453d89fc9fd6f52be58
-https://bugs.gentoo.org/909554
-
-From 836631f2f73d45baa4021453d89fc9fd6f52be58 Mon Sep 17 00:00:00 2001
-From: Anthony Sottile
-Date: Mon, 12 Jun 2023 21:00:45 -0400
-Subject: [PATCH] fix error reporter and testsuite in 3.11.4+ (#775)
-
a/pyflakes/reporter.py
-+++ b/pyflakes/reporter.py
-@@ -56,8 +56,9 @@ def syntaxError(self, filename, msg, lineno, offset, text):
- else:
- line = text.splitlines()[-1]
-
-+# lineno might be None if the error was during tokenization
- # lineno might be 0 if the error came from stdin
--lineno = max(lineno, 1)
-+lineno = max(lineno or 0, 1)
-
- if offset is not None:
- # some versions of python emit an offset of -1 for certain
encoding errors
a/pyflakes/test/test_api.py
-+++ b/pyflakes/test/test_api.py
-@@ -621,8 +621,12 @@ def test_misencodedFileUTF16(self):
- x = "%s"
- """ % SNOWMAN).encode('utf-16')
- with self.makeTempFile(source) as sourcePath:
--self.assertHasErrors(
--sourcePath, [f"{sourcePath}: problem decoding source\n"])
-+if sys.version_info < (3, 11, 4):
-+expected = f"{sourcePath}: problem decoding source\n"
-+else:
-+expected = f"{sourcePath}:1: source code string cannot
contain null bytes\n" # noqa: E501
-+
-+self.assertHasErrors(sourcePath, [expected])
-
- def test_checkRecursive(self):
- """
diff --git a/dev-python/pyflakes/pyflakes-3.0.1-r1.ebuild
b/dev-python/pyflakes/pyflakes-3.0.1-r1.ebuild
deleted file mode 100644
index 4060d6d1f972..
--- a/dev-python/pyflakes/pyflakes-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Passive checker for Python programs"
-HOMEPAGE="
- https://github.com/PyCQA/pyflakes/
- https://pypi.org/project/pyflakes/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x64-solaris"
-
-PATCHES=(
- "${FILESDIR}"/${P}-python3.11.patch
-)
-
-distutils_enable_tests unittest
[gentoo-commits] repo/gentoo:master commit in: dev-python/pyflakes/, dev-python/pyflakes/files/
commit: 2ad9afe722a7b6e774941e9a03d1e66aa827241a
Author: Sam James gentoo org>
AuthorDate: Tue Jul 4 19:08:43 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue Jul 4 19:09:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ad9afe7
dev-python/pyflakes: disable py3.9, style tweak
Signed-off-by: Sam James gentoo.org>
dev-python/pyflakes/files/pyflakes-3.0.1-python3.11.patch | 10 +-
dev-python/pyflakes/pyflakes-3.0.1-r1.ebuild | 4 +++-
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/dev-python/pyflakes/files/pyflakes-3.0.1-python3.11.patch
b/dev-python/pyflakes/files/pyflakes-3.0.1-python3.11.patch
index b2e7f57b2bad..db804f42c775 100644
--- a/dev-python/pyflakes/files/pyflakes-3.0.1-python3.11.patch
+++ b/dev-python/pyflakes/files/pyflakes-3.0.1-python3.11.patch
@@ -1,17 +1,11 @@
https://github.com/PyCQA/pyflakes/commit/836631f2f73d45baa4021453d89fc9fd6f52be58
https://bugs.gentoo.org/909554
+
From 836631f2f73d45baa4021453d89fc9fd6f52be58 Mon Sep 17 00:00:00 2001
From: Anthony Sottile
Date: Mon, 12 Jun 2023 21:00:45 -0400
Subject: [PATCH] fix error reporter and testsuite in 3.11.4+ (#775)
- pyflakes/reporter.py | 3 ++-
- pyflakes/test/test_api.py | 8 ++--
- 2 files changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/pyflakes/reporter.py b/pyflakes/reporter.py
-index af834d1c..65ed4d8e 100644
--- a/pyflakes/reporter.py
+++ b/pyflakes/reporter.py
@@ -56,8 +56,9 @@ def syntaxError(self, filename, msg, lineno, offset, text):
@@ -25,8 +19,6 @@ index af834d1c..65ed4d8e 100644
if offset is not None:
# some versions of python emit an offset of -1 for certain
encoding errors
-diff --git a/pyflakes/test/test_api.py b/pyflakes/test/test_api.py
-index 5c1879c1..13e8f685 100644
--- a/pyflakes/test/test_api.py
+++ b/pyflakes/test/test_api.py
@@ -621,8 +621,12 @@ def test_misencodedFileUTF16(self):
diff --git a/dev-python/pyflakes/pyflakes-3.0.1-r1.ebuild
b/dev-python/pyflakes/pyflakes-3.0.1-r1.ebuild
index 2e8999e03a38..cbe9dae91c15 100644
--- a/dev-python/pyflakes/pyflakes-3.0.1-r1.ebuild
+++ b/dev-python/pyflakes/pyflakes-3.0.1-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..11} pypy3 )
inherit distutils-r1 pypi
@@ -17,7 +17,9 @@ HOMEPAGE="
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x64-solaris"
+
PATCHES=(
"${FILESDIR}"/${P}-python3.11.patch
)
+
distutils_enable_tests unittest
[gentoo-commits] repo/gentoo:master commit in: dev-python/pyflakes/, dev-python/pyflakes/files/
commit: 49115658faf84e828ac7ad8aeecb680e6f58c23c
Author: Michał Górny gentoo org>
AuthorDate: Mon May 23 09:34:21 2022 +
Commit: Michał Górny gentoo org>
CommitDate: Mon May 23 09:34:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49115658
dev-python/pyflakes: Remove old
Signed-off-by: Michał Górny gentoo.org>
dev-python/pyflakes/Manifest | 2 -
.../pyflakes/files/pyflakes-2.2.0-fix-tests.patch | 97 --
.../files/pyflakes-2.3.1-fix-py3.10-tests.patch| 91
dev-python/pyflakes/pyflakes-2.2.0.ebuild | 23 -
dev-python/pyflakes/pyflakes-2.3.1.ebuild | 21 -
5 files changed, 234 deletions(-)
diff --git a/dev-python/pyflakes/Manifest b/dev-python/pyflakes/Manifest
index b6111d4ce98b..04c263596156 100644
--- a/dev-python/pyflakes/Manifest
+++ b/dev-python/pyflakes/Manifest
@@ -1,3 +1 @@
-DIST pyflakes-2.2.0.tar.gz 65307 BLAKE2B
e48e0cb0497f90b6482c0fd08c182d766ab50755fe348352df510841f4ad43f7c1d6486753ce774603a3624f49c9b0165ad930bb1451ef30cf2e828d732e0652
SHA512
6a411efef261874c216b71bcb095412448a8cbeefdf7fa5577d4f4edd48a4a740a4433665e87e5dda2c08fd9ee3bfb7f134f56c7523e1303243edfa92b0ccb35
-DIST pyflakes-2.3.1.tar.gz 68567 BLAKE2B
0eee1eb87bf1dcae68afcdb250644aa8a1189ca3d8d22608e25727bf01b94465cceb6c65be669b18779434c8879594dd92cfb3a108b7aff584cfda788f6e2f4f
SHA512
85d3a2737d31ed4b5f4c2e3621759a5951d1320f95d74313fec09fa551648105b3ab84db94f7bffe5b77623e4adbea1d8ad12b9ce2fee7e81c41581a3ea81cc6
DIST pyflakes-2.4.0.tar.gz 69101 BLAKE2B
852e50f3545138947761f9a8413fd6463bb9a28977c008feb1c3a81afb3854501b8fd3c05840d9d75bc6ebf505b545e62c047b87780b0bc764fd4225ea6a1e21
SHA512
f4c6512eb811511c897623f52c4f88e50275a3292582d7dd34462e90e39fecce939818cb92e750eebdd66eab25b91c23540104fc4530c42621d7cfeb1d33c577
diff --git a/dev-python/pyflakes/files/pyflakes-2.2.0-fix-tests.patch
b/dev-python/pyflakes/files/pyflakes-2.2.0-fix-tests.patch
deleted file mode 100644
index 00b1130bf342..
--- a/dev-python/pyflakes/files/pyflakes-2.2.0-fix-tests.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff --git a/pyflakes/test/test_api.py b/pyflakes/test/test_api.py
-index b579ac8..d379b3b 100644
a/pyflakes/test/test_api.py
-+++ b/pyflakes/test/test_api.py
-@@ -515,8 +513,10 @@ def foo(bar=baz, bax):
- """
- with self.makeTempFile(source) as sourcePath:
- if ERROR_HAS_LAST_LINE:
--if PYPY and sys.version_info >= (3,):
-+if PYPY:
- column = 7
-+elif sys.version_info >= (3, 9):
-+column = 21
- elif sys.version_info >= (3, 8):
- column = 9
- else:
-@@ -543,8 +543,10 @@ foo(bar=baz, bax)
- """
- with self.makeTempFile(source) as sourcePath:
- if ERROR_HAS_LAST_LINE:
--if PYPY and sys.version_info >= (3,):
-+if PYPY:
- column = 12
-+elif sys.version_info >= (3, 9):
-+column = 17
- elif sys.version_info >= (3, 8):
- column = 14
- else:
-@@ -578,7 +580,9 @@ foo(bar=baz, bax)
- else:
- position_end = 1
- if PYPY:
--column = 6
-+column = 5
-+elif ver >= (3, 9):
-+column = 13
- else:
- column = 7
- # Column has been "fixed" since 3.2.4 and 3.3.1
-@@ -717,13 +721,6 @@ class IntegrationTests(TestCase):
- """
- Tests of the pyflakes script that actually spawn the script.
- """
--
--#
https://bitbucket.org/pypy/pypy/issues/3069/pypy36-on-windows-incorrect-line-separator
--if PYPY and sys.version_info >= (3,) and WIN:
--LINESEP = '\n'
--else:
--LINESEP = os.linesep
--
- def setUp(self):
- self.tempdir = tempfile.mkdtemp()
- self.tempfilepath = os.path.join(self.tempdir, 'temp')
-@@ -784,7 +781,7 @@ class IntegrationTests(TestCase):
- fd.write("import contraband\n".encode('ascii'))
- d = self.runPyflakes([self.tempfilepath])
- expected = UnusedImport(self.tempfilepath, Node(1), 'contraband')
--self.assertEqual(d, ("%s%s" % (expected, self.LINESEP), '', 1))
-+self.assertEqual(d, ("%s%s" % (expected, os.linesep), '', 1))
-
- def test_errors_io(self):
- """
-@@ -794,7 +791,7 @@ class IntegrationTests(TestCase):
- """
- d = self.runPyflakes([self.tempfilepath])
- error_msg = '%s: No such file or directory%s' % (self.tempfilepath,
-- self.LINESEP)
-+ os.linesep)
- self.assertEqual(d, ('', error_msg, 1))
-
- def test_errors_syntax(self):
-@@ -807,7 +804,7
[gentoo-commits] repo/gentoo:master commit in: dev-python/pyflakes/, dev-python/pyflakes/files/
commit: 3ca6c4f0c9e645c6de2bda436cc898a3f0539c55
Author: Zamarin Arthur gmail com>
AuthorDate: Tue May 25 13:49:14 2021 +
Commit: Michał Górny gentoo org>
CommitDate: Tue May 25 16:04:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ca6c4f0
dev-python/pyflakes: bump to python 3.10
passes tests
Signed-off-by: Zamarin Arthur gmail.com>
Signed-off-by: Michał Górny gentoo.org>
.../files/pyflakes-2.3.1-fix-py3.10-tests.patch| 91 ++
dev-python/pyflakes/pyflakes-2.3.1.ebuild | 6 +-
2 files changed, 96 insertions(+), 1 deletion(-)
diff --git a/dev-python/pyflakes/files/pyflakes-2.3.1-fix-py3.10-tests.patch
b/dev-python/pyflakes/files/pyflakes-2.3.1-fix-py3.10-tests.patch
new file mode 100644
index 000..c96585d20c7
--- /dev/null
+++ b/dev-python/pyflakes/files/pyflakes-2.3.1-fix-py3.10-tests.patch
@@ -0,0 +1,91 @@
+From f3b1b44bf3d2d5927004fa1c2fcf1ab2def816b9 Mon Sep 17 00:00:00 2001
+From: Anthony Sottile
+Date: Thu, 20 May 2021 07:23:19 -0700
+Subject: [PATCH] fix syntax error offsets for python 3.10 (#635)
+
+---
+ .github/workflows/test.yml | 2 +-
+ pyflakes/test/test_api.py | 43 +-
+ tox.ini| 2 +-
+ 3 files changed, 30 insertions(+), 17 deletions(-)
+
+diff --git a/pyflakes/test/test_api.py b/pyflakes/test/test_api.py
+index d379b3b7..2c1cf19d 100644
+--- a/pyflakes/test/test_api.py
b/pyflakes/test/test_api.py
+@@ -441,7 +441,7 @@ def evaluate(source):
+ evaluate(source)
+ except SyntaxError:
+ e = sys.exc_info()[1]
+-if not PYPY:
++if not PYPY and sys.version_info < (3, 10):
+ self.assertTrue(e.text.count('\n') > 1)
+ else:
+ self.fail()
+@@ -449,10 +449,17 @@ def evaluate(source):
+ with self.makeTempFile(source) as sourcePath:
+ if PYPY:
+ message = 'end of file (EOF) while scanning triple-quoted
string literal'
++elif sys.version_info >= (3, 10):
++message = 'unterminated triple-quoted string literal
(detected at line 8)' # noqa: E501
+ else:
+ message = 'invalid syntax'
+
+-column = 8 if sys.version_info >= (3, 8) else 11
++if sys.version_info >= (3, 10):
++column = 12
++elif sys.version_info >= (3, 8):
++column = 8
++else:
++column = 11
+ self.assertHasErrors(
+ sourcePath,
+ ["""\
+@@ -468,21 +475,25 @@ def test_eofSyntaxError(self):
+ """
+ with self.makeTempFile("def foo(") as sourcePath:
+ if PYPY:
+-result = """\
+-%s:1:7: parenthesis is never closed
+-def foo(
+- ^
+-""" % (sourcePath,)
++msg = 'parenthesis is never closed'
++elif sys.version_info >= (3, 10):
++msg = "'(' was never closed"
+ else:
+-result = """\
+-%s:1:9: unexpected EOF while parsing
+-def foo(
+-^
+-""" % (sourcePath,)
++msg = 'unexpected EOF while parsing'
+
+-self.assertHasErrors(
+-sourcePath,
+-[result])
++if PYPY:
++column = 7
++elif sys.version_info >= (3, 10):
++column = 8
++else:
++column = 9
++
++spaces = ' ' * (column - 1)
++expected = '{}:1:{}: {}\ndef foo(\n{}^\n'.format(
++sourcePath, column, msg, spaces
++)
++
++self.assertHasErrors(sourcePath, [expected])
+
+ def test_eofSyntaxErrorWithTab(self):
+ """
+@@ -515,6 +526,8 @@ def foo(bar=baz, bax):
+ if ERROR_HAS_LAST_LINE:
+ if PYPY:
+ column = 7
++elif sys.version_info >= (3, 10):
++column = 18
+ elif sys.version_info >= (3, 9):
+ column = 21
+ elif sys.version_info >= (3, 8):
diff --git a/dev-python/pyflakes/pyflakes-2.3.1.ebuild
b/dev-python/pyflakes/pyflakes-2.3.1.ebuild
index 454409b0717..a556099613d 100644
--- a/dev-python/pyflakes/pyflakes-2.3.1.ebuild
+++ b/dev-python/pyflakes/pyflakes-2.3.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
# Uses pkg_resources
DISTUTILS_USE_SETUPTOOLS=rdepend
@@ -17,4 +17,8 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris
~x64-solaris ~x86-solaris"
+PATCHES=(
+ "${FILESDIR}/${P}-fix-py3.10-tests.patch"
+)
+
distutils_enable_tests unittest
[gentoo-commits] repo/gentoo:master commit in: dev-python/pyflakes/, dev-python/pyflakes/files/
commit: d4ed1ac8fbba6c8fad4f265ff2c412c57ee9ad98
Author: Louis Sautier gentoo org>
AuthorDate: Sat Oct 3 00:27:21 2020 +
Commit: Louis Sautier gentoo org>
CommitDate: Sat Oct 3 00:31:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4ed1ac8
dev-python/pyflakes: add Python 3.9 support, fix tests
Also fix setuptools dependency.
Closes: https://bugs.gentoo.org/746083
Closes: https://bugs.gentoo.org/743691
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Louis Sautier gentoo.org>
.../pyflakes/files/pyflakes-2.2.0-fix-tests.patch | 97 ++
dev-python/pyflakes/pyflakes-2.2.0.ebuild | 8 +-
2 files changed, 103 insertions(+), 2 deletions(-)
diff --git a/dev-python/pyflakes/files/pyflakes-2.2.0-fix-tests.patch
b/dev-python/pyflakes/files/pyflakes-2.2.0-fix-tests.patch
new file mode 100644
index 000..00b1130bf34
--- /dev/null
+++ b/dev-python/pyflakes/files/pyflakes-2.2.0-fix-tests.patch
@@ -0,0 +1,97 @@
+diff --git a/pyflakes/test/test_api.py b/pyflakes/test/test_api.py
+index b579ac8..d379b3b 100644
+--- a/pyflakes/test/test_api.py
b/pyflakes/test/test_api.py
+@@ -515,8 +513,10 @@ def foo(bar=baz, bax):
+ """
+ with self.makeTempFile(source) as sourcePath:
+ if ERROR_HAS_LAST_LINE:
+-if PYPY and sys.version_info >= (3,):
++if PYPY:
+ column = 7
++elif sys.version_info >= (3, 9):
++column = 21
+ elif sys.version_info >= (3, 8):
+ column = 9
+ else:
+@@ -543,8 +543,10 @@ foo(bar=baz, bax)
+ """
+ with self.makeTempFile(source) as sourcePath:
+ if ERROR_HAS_LAST_LINE:
+-if PYPY and sys.version_info >= (3,):
++if PYPY:
+ column = 12
++elif sys.version_info >= (3, 9):
++column = 17
+ elif sys.version_info >= (3, 8):
+ column = 14
+ else:
+@@ -578,7 +580,9 @@ foo(bar=baz, bax)
+ else:
+ position_end = 1
+ if PYPY:
+-column = 6
++column = 5
++elif ver >= (3, 9):
++column = 13
+ else:
+ column = 7
+ # Column has been "fixed" since 3.2.4 and 3.3.1
+@@ -717,13 +721,6 @@ class IntegrationTests(TestCase):
+ """
+ Tests of the pyflakes script that actually spawn the script.
+ """
+-
+-#
https://bitbucket.org/pypy/pypy/issues/3069/pypy36-on-windows-incorrect-line-separator
+-if PYPY and sys.version_info >= (3,) and WIN:
+-LINESEP = '\n'
+-else:
+-LINESEP = os.linesep
+-
+ def setUp(self):
+ self.tempdir = tempfile.mkdtemp()
+ self.tempfilepath = os.path.join(self.tempdir, 'temp')
+@@ -784,7 +781,7 @@ class IntegrationTests(TestCase):
+ fd.write("import contraband\n".encode('ascii'))
+ d = self.runPyflakes([self.tempfilepath])
+ expected = UnusedImport(self.tempfilepath, Node(1), 'contraband')
+-self.assertEqual(d, ("%s%s" % (expected, self.LINESEP), '', 1))
++self.assertEqual(d, ("%s%s" % (expected, os.linesep), '', 1))
+
+ def test_errors_io(self):
+ """
+@@ -794,7 +791,7 @@ class IntegrationTests(TestCase):
+ """
+ d = self.runPyflakes([self.tempfilepath])
+ error_msg = '%s: No such file or directory%s' % (self.tempfilepath,
+- self.LINESEP)
++ os.linesep)
+ self.assertEqual(d, ('', error_msg, 1))
+
+ def test_errors_syntax(self):
+@@ -807,7 +804,7 @@ class IntegrationTests(TestCase):
+ fd.write("import".encode('ascii'))
+ d = self.runPyflakes([self.tempfilepath])
+ error_msg = '{0}:1:{2}: invalid syntax{1}import{1}
{3}^{1}'.format(
+-self.tempfilepath, self.LINESEP, 6 if PYPY else 7, '' if PYPY
else ' ')
++self.tempfilepath, os.linesep, 6 if PYPY else 7, '' if PYPY else
' ')
+ self.assertEqual(d, ('', error_msg, 1))
+
+ def test_readFromStdin(self):
+@@ -816,15 +813,13 @@ class IntegrationTests(TestCase):
+ """
+ d = self.runPyflakes([], stdin='import contraband')
+ expected = UnusedImport('', Node(1), 'contraband')
+-self.assertEqual(d, ("%s%s" % (expected, self.LINESEP), '', 1))
++self.assertEqual(d, ("%s%s" % (expected, os.linesep), '', 1))
+
+
+ class TestMain(IntegrationTests):
+ """
+ Tests of the pyflakes main function.
+ """
+-LINESEP = os.linesep
+-
+ def runPyflakes(self, paths, stdin=None):
+ try:
+ with SysStreamCapturing(stdin) as capture:
diff --git a/dev-python/pyflakes/pyflakes-2.2.0.ebuild
