[gentoo-portage-dev] [PATCH 1/6] lib/portage/elog/mod_mail.py: fix multiple-imports

[gentoo-portage-dev] [PATCH 1/6] lib/portage/elog/mod_mail.py: fix multiple-imports

[Aaron Bauman]

Signed-off-by: Aaron Bauman <bman@gentoo.org>
---
 lib/portage/elog/mod_mail.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/portage/elog/mod_mail.py b/lib/portage/elog/mod_mail.py
index 4edf507eb..38eaa277f 100644
--- a/lib/portage/elog/mod_mail.py
+++ b/lib/portage/elog/mod_mail.py
@@ -2,7 +2,9 @@
 # Copyright 2006-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-import portage.mail, socket
+import portage.mail
+import socket
+
 from portage.exception import PortageException
 from portage.localization import _
 from portage.util import writemsg
-- 
2.28.0

[gentoo-portage-dev] [PATCH 2/6] lib/portage/elog/mod_custom.py: fix multiple-imports

[Aaron Bauman]

Signed-off-by: Aaron Bauman <bman@gentoo.org>
---
 lib/portage/elog/mod_custom.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/portage/elog/mod_custom.py b/lib/portage/elog/mod_custom.py
index 836bdad62..7cfafeccc 100644
--- a/lib/portage/elog/mod_custom.py
+++ b/lib/portage/elog/mod_custom.py
@@ -2,7 +2,9 @@
 # Copyright 2006-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-import portage.elog.mod_save, portage.process, portage.exception
+import portage.elog.mod_save
+import portage.exception
+import portage.process
 
 def process(mysettings, key, logentries, fulltext):
 	elogfilename = portage.elog.mod_save.process(mysettings, key, logentries, fulltext)
-- 
2.28.0

[gentoo-portage-dev] [PATCH 3/6] lib/portage/tests/runTests.py: fix multiple-imports

[Aaron Bauman]

Signed-off-by: Aaron Bauman <bman@gentoo.org>
---
 lib/portage/tests/runTests.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/portage/tests/runTests.py b/lib/portage/tests/runTests.py
index d4d1f7c76..9514abebe 100755
--- a/lib/portage/tests/runTests.py
+++ b/lib/portage/tests/runTests.py
@@ -1,14 +1,15 @@
 #!/usr/bin/python -bWd
 # runTests.py -- Portage Unit Test Functionality
-# Copyright 2006-2014 Gentoo Foundation
+# Copyright 2006-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-import os, sys
-import os.path as osp
 import grp
+import os
+import os.path as osp
 import platform
 import pwd
 import signal
+import sys
 
 def debug_signal(signum, frame):
 	import pdb
-- 
2.28.0

[gentoo-portage-dev] [PATCH 4/6] lib/portage/dep/__init__.py: fix multiple-imports

[Aaron Bauman]

Signed-off-by: Aaron Bauman <bman@gentoo.org>
---
 lib/portage/dep/__init__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/portage/dep/__init__.py b/lib/portage/dep/__init__.py
index 50266a21b..c0ed2dd3c 100644
--- a/lib/portage/dep/__init__.py
+++ b/lib/portage/dep/__init__.py
@@ -13,8 +13,10 @@ __all__ = [
 	'_repo_separator', '_slot_separator',
 ]
 
-import re, sys
+import re
+import sys
 import warnings
+
 from functools import lru_cache
 
 import portage
-- 
2.28.0

[gentoo-portage-dev] [PATCH 5/6] tabcheck.py: fix multiple-imports

[Aaron Bauman]

Signed-off-by: Aaron Bauman <bman@gentoo.org>
---
 tabcheck.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tabcheck.py b/tabcheck.py
index a28ad93d9..1df26785d 100755
--- a/tabcheck.py
+++ b/tabcheck.py
@@ -1,6 +1,7 @@
 #!/usr/bin/python -b
 
-import tabnanny,sys
+import sys
+import tabnanny
 
 for x in sys.argv:
 	tabnanny.check(x)
-- 
2.28.0

[gentoo-portage-dev] [PATCH 6/6] pylintrc: enable multiple-imports check

[Aaron Bauman]

Signed-off-by: Aaron Bauman <bman@gentoo.org>
---
 pylintrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pylintrc b/pylintrc
index b7091516c..5f4ec3278 100644
--- a/pylintrc
+++ b/pylintrc
@@ -19,6 +19,7 @@ enable=
         misplaced-future,
         missing-final-newline,
         mixed-line-endings,
+        multiple-imports,
         redefined-builtin,
         reimported,
         relative-beyond-top-level,
-- 
2.28.0

Re: [gentoo-portage-dev] [PATCH 6/6] pylintrc: enable multiple-imports check

[Zac Medico]

[-- Attachment #1.1: Type: text/plain, Size: 672 bytes --]

On 8/5/20 4:51 PM, Aaron Bauman wrote:
> Signed-off-by: Aaron Bauman <bman@gentoo.org>
> ---
>  pylintrc | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/pylintrc b/pylintrc
> index b7091516c..5f4ec3278 100644
> --- a/pylintrc
> +++ b/pylintrc
> @@ -19,6 +19,7 @@ enable=
>          misplaced-future,
>          missing-final-newline,
>          mixed-line-endings,
> +        multiple-imports,
>          redefined-builtin,
>          reimported,
>          relative-beyond-top-level,
> 

Thanks, merged the whole series:

https://gitweb.gentoo.org/proj/portage.git/commit/?id=bc0e50294a96623fdfcb51d7cea4c3d2a4c5e261
-- 
Thanks,
Zac


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 981 bytes --]