| 1 |
commit: 0dffa633987a49c1a1d7e95edfe6afeb6269d1e5 |
| 2 |
Author: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 7 00:03:31 2020 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 7 02:53:11 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=0dffa633 |
| 7 |
|
| 8 |
lib/*: exempt two core files from ungrouped-imports check |
| 9 |
|
| 10 |
* These will take some time to refactor/address if at all possible. |
| 11 |
* Turn on ungrouped-imports check for entire repo |
| 12 |
|
| 13 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
| 14 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 15 |
|
| 16 |
lib/portage/__init__.py | 1 + |
| 17 |
lib/portage/checksum.py | 15 ++++++++------- |
| 18 |
pylintrc | 1 + |
| 19 |
3 files changed, 10 insertions(+), 7 deletions(-) |
| 20 |
|
| 21 |
diff --git a/lib/portage/__init__.py b/lib/portage/__init__.py |
| 22 |
index 73bb1ed0d..916c93510 100644 |
| 23 |
--- a/lib/portage/__init__.py |
| 24 |
+++ b/lib/portage/__init__.py |
| 25 |
@@ -1,5 +1,6 @@ |
| 26 |
# Copyright 1998-2020 Gentoo Authors |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
+# pylint: disable=ungrouped-imports |
| 29 |
|
| 30 |
VERSION = "HEAD" |
| 31 |
|
| 32 |
|
| 33 |
diff --git a/lib/portage/checksum.py b/lib/portage/checksum.py |
| 34 |
index d4a75c058..b5dae9672 100644 |
| 35 |
--- a/lib/portage/checksum.py |
| 36 |
+++ b/lib/portage/checksum.py |
| 37 |
@@ -1,20 +1,21 @@ |
| 38 |
# checksum.py -- core Portage functionality |
| 39 |
# Copyright 1998-2020 Gentoo Authors |
| 40 |
# Distributed under the terms of the GNU General Public License v2 |
| 41 |
+# pylint: disable=ungrouped-imports |
| 42 |
|
| 43 |
-import portage |
| 44 |
-from portage.const import PRELINK_BINARY, HASHING_BLOCKSIZE |
| 45 |
-from portage.localization import _ |
| 46 |
-from portage import os |
| 47 |
-from portage import _encodings |
| 48 |
-from portage import _unicode_decode, _unicode_encode |
| 49 |
import errno |
| 50 |
import functools |
| 51 |
import hashlib |
| 52 |
+import portage |
| 53 |
import stat |
| 54 |
import subprocess |
| 55 |
import tempfile |
| 56 |
|
| 57 |
+from portage import _encodings, _unicode_decode, _unicode_encode |
| 58 |
+from portage import os |
| 59 |
+from portage.const import HASHING_BLOCKSIZE, PRELINK_BINARY |
| 60 |
+from portage.localization import _ |
| 61 |
+ |
| 62 |
|
| 63 |
# Summary of all available hashes and their implementations, |
| 64 |
# most preferred first. Please keep this in sync with logic below. |
| 65 |
@@ -32,7 +33,7 @@ import tempfile |
| 66 |
# SHA3_512: hashlib (3.6+), pysha3, pycrypto |
| 67 |
|
| 68 |
|
| 69 |
-#dict of all available hash functions |
| 70 |
+# Dict of all available hash functions |
| 71 |
hashfunc_map = {} |
| 72 |
hashorigin_map = {} |
| 73 |
|
| 74 |
|
| 75 |
diff --git a/pylintrc b/pylintrc |
| 76 |
index 9b0975329..f2aadf14f 100644 |
| 77 |
--- a/pylintrc |
| 78 |
+++ b/pylintrc |
| 79 |
@@ -28,6 +28,7 @@ enable= |
| 80 |
trailing-newlines, |
| 81 |
trailing-whitespace, |
| 82 |
unexpected-line-ending-format, |
| 83 |
+ ungrouped-imports, |
| 84 |
unnecessary-semicolon, |
| 85 |
unused-import, |
| 86 |
useless-import-alias, |
Archives