[gentoo-portage-dev] [PATCH 1/4] lib/portage/output.py: fix unnecessary-semicolon

[gentoo-portage-dev] [PATCH 1/4] lib/portage/output.py: fix unnecessary-semicolon

[Aaron Bauman]

Signed-off-by: Aaron Bauman <bman@gentoo.org>
---
 lib/portage/output.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/portage/output.py b/lib/portage/output.py
index ab99caf98..098285a52 100644
--- a/lib/portage/output.py
+++ b/lib/portage/output.py
@@ -231,7 +231,7 @@ def _parse_color_map(config_root='/', onerror=None):
 		raise
 
 def nc_len(mystr):
-	tmp = re.sub(esc_seq + "^m]+m", "", mystr);
+	tmp = re.sub(esc_seq + "^m]+m", "", mystr)
 	return len(tmp)
 
 _legal_terms_re = re.compile(r'^(xterm|xterm-color|Eterm|aterm|rxvt|screen|kterm|rxvt-unicode|gnome|interix|tmux|st-256color|alacritty|konsole)')
-- 
2.28.0

[gentoo-portage-dev] [PATCH 2/4] lib/portage/emaint/modules/merges/merges.py: fix unnecessary-semicolon

[Aaron Bauman]

Signed-off-by: Aaron Bauman <bman@gentoo.org>
---
 lib/portage/emaint/modules/merges/merges.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/portage/emaint/modules/merges/merges.py b/lib/portage/emaint/modules/merges/merges.py
index a2b70edb8..775dc59d2 100644
--- a/lib/portage/emaint/modules/merges/merges.py
+++ b/lib/portage/emaint/modules/merges/merges.py
@@ -1,4 +1,4 @@
-# Copyright 2005-2014 Gentoo Foundation
+# Copyright 2005-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 import portage
@@ -93,7 +93,7 @@ class MergesHandler:
 	def __init__(self):
 		"""Create MergesHandler object."""
 		eroot = portage.settings['EROOT']
-		tracking_path = os.path.join(eroot, PRIVATE_PATH, 'failed-merges');
+		tracking_path = os.path.join(eroot, PRIVATE_PATH, 'failed-merges')
 		self._tracking_file = TrackingFile(tracking_path)
 		self._vardb_path = os.path.join(eroot, VDB_PATH)
 
-- 
2.28.0

[gentoo-portage-dev] [PATCH 3/4] lib/portage/util/env_update.py: fix unnecessary-semicolon

[Aaron Bauman]

Signed-off-by: Aaron Bauman <bman@gentoo.org>
---
 lib/portage/util/env_update.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/portage/util/env_update.py b/lib/portage/util/env_update.py
index 9c6fe3cdd..7a2ee2551 100644
--- a/lib/portage/util/env_update.py
+++ b/lib/portage/util/env_update.py
@@ -213,7 +213,7 @@ def _env_update(makelinks, target_root, prev_mtimes, contents, env,
 		newprelink.write("# contents of /etc/env.d directory\n")
 
 		for x in sorted(potential_lib_dirs) + ['bin', 'sbin']:
-			newprelink.write('-l /%s\n' % (x,));
+			newprelink.write('-l /%s\n' % (x,))
 		prelink_paths = set()
 		prelink_paths |= set(specials.get('LDPATH', []))
 		prelink_paths |= set(specials.get('PATH', []))
-- 
2.28.0

[gentoo-portage-dev] [PATCH 4/4] pylintrc: enable more checks

[Aaron Bauman]

* These checks are already passing... so let's enable them so we do not
  have regressions
* Sort the checks alphabetically and break into more manageable
  structure
* Display all warnings/errors from pylint by enabling all messages as
  all listed checks are now passing. This will allow folks to run
  'pylint' without having to modify the pylintrc.

Signed-off-by: Aaron Bauman <bman@gentoo.org>
---
 pylintrc | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pylintrc b/pylintrc
index 7fd05f322..1f6867d21 100644
--- a/pylintrc
+++ b/pylintrc
@@ -12,7 +12,15 @@
 # --disable=W".
 #disable=no-absolute-import,bad-continuation,C0103,C0114,C0115,E1101,W0201,no-name-in-module
 disable=all
-enable=redefined-builtin,useless-object-inheritance,trailing-newlines,unused-import,trailing-whitespace
+enable=missing-final-newline,
+	mixed-line-endings,
+	redefined-builtin,
+	trailing-newlines,
+	trailing-whitespace,
+	unexpected-line-ending-format,
+	unnecessary-semicolon,
+	useless-object-inheritance,
+	unused-import
 
 # A comma-separated list of package or module names from where C extensions may
 # be loaded. Extensions are loading into the active Python interpreter and may
@@ -51,7 +59,7 @@ unsafe-load-any-extension=no
 
 # Only show warnings with the listed confidence levels. Leave empty to show
 # all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED.
-confidence=HIGH
+confidence=
 
 [REPORTS]
 
-- 
2.28.0

Re: [gentoo-portage-dev] [PATCH 4/4] pylintrc: enable more checks

[Zac Medico]

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

On 8/3/20 5:16 PM, Aaron Bauman wrote:
> * These checks are already passing... so let's enable them so we do not
>   have regressions
> * Sort the checks alphabetically and break into more manageable
>   structure
> * Display all warnings/errors from pylint by enabling all messages as
>   all listed checks are now passing. This will allow folks to run
>   'pylint' without having to modify the pylintrc.
> 
> Signed-off-by: Aaron Bauman <bman@gentoo.org>
> ---
>  pylintrc | 12 ++++++++++--
>  1 file changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/pylintrc b/pylintrc
> index 7fd05f322..1f6867d21 100644
> --- a/pylintrc
> +++ b/pylintrc
> @@ -12,7 +12,15 @@
>  # --disable=W".
>  #disable=no-absolute-import,bad-continuation,C0103,C0114,C0115,E1101,W0201,no-name-in-module
>  disable=all
> -enable=redefined-builtin,useless-object-inheritance,trailing-newlines,unused-import,trailing-whitespace
> +enable=missing-final-newline,
> +	mixed-line-endings,
> +	redefined-builtin,
> +	trailing-newlines,
> +	trailing-whitespace,
> +	unexpected-line-ending-format,
> +	unnecessary-semicolon,
> +	useless-object-inheritance,
> +	unused-import
>  
>  # A comma-separated list of package or module names from where C extensions may
>  # be loaded. Extensions are loading into the active Python interpreter and may
> @@ -51,7 +59,7 @@ unsafe-load-any-extension=no
>  
>  # Only show warnings with the listed confidence levels. Leave empty to show
>  # all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED.
> -confidence=HIGH
> +confidence=
>  
>  [REPORTS]
>  
> 

Thanks, merged the whole series:

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


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