[gentoo-catalyst] [PATCH] lint: clean up global statement warnings

[gentoo-catalyst] [PATCH] lint: clean up global statement warnings

[Mike Frysinger]

Delete unused calls and add disables for the ones we actively want.  We
generally want to avoid calls to "global" so force people to disable the
warning whenever they try to use it.
---
 catalyst/support.py | 2 --
 catalyst/version.py | 2 ++
 setup.py            | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/catalyst/support.py b/catalyst/support.py
index a879eaf..1e3eeef 100644
--- a/catalyst/support.py
+++ b/catalyst/support.py
@@ -294,8 +294,6 @@ def ismount(path):
 
 def addl_arg_parse(myspec,addlargs,requiredspec,validspec):
 	"helper function to help targets parse additional arguments"
-	global valid_config_file_values
-
 	messages = []
 	for x in addlargs.keys():
 		if x not in validspec and x not in valid_config_file_values and x not in requiredspec:
diff --git a/catalyst/version.py b/catalyst/version.py
index d5c5cde..5deb4d7 100644
--- a/catalyst/version.py
+++ b/catalyst/version.py
@@ -18,6 +18,7 @@ _ver = None
 
 def get_git_version(version=__version__):
 	"""Return: a string describing our version."""
+	# pylint: disable=global-statement
 	global _ver
 	cwd = os.path.dirname(os.path.abspath(__file__))
 	version_info = get_ver(cwd)
@@ -39,6 +40,7 @@ def get_version(reset=False):
 	'''Returns a saved release version string or the
 	generated git release version.
 	'''
+	# pylint: disable=global-statement
 	global __version__, _ver
 	if _ver and not reset:
 		return _ver
diff --git a/setup.py b/setup.py
index 27ed2de..e4569ee 100755
--- a/setup.py
+++ b/setup.py
@@ -55,7 +55,6 @@ _data_files.extend(_files('share/catalyst/targets', 'targets'))
 class set_version(_Command):
 	'''Saves the specified release version information
 	'''
-	global __version__
 	description = "hardcode script's version using VERSION from environment"
 	user_options = []  # [(long_name, short_name, desc),]
 
@@ -66,6 +65,8 @@ class set_version(_Command):
 		pass
 
 	def run(self):
+		# pylint: disable=global-statement
+		global __version__
 		try:
 			version = _os.environ['VERSION']
 		except KeyError:
-- 
2.5.2

Re: [gentoo-catalyst] [PATCH] lint: clean up global statement warnings

[Brian Dolbec]

On Tue,  6 Oct 2015 00:16:35 -0400
Mike Frysinger <vapier@gentoo.org> wrote:

> Delete unused calls and add disables for the ones we actively want.
> We generally want to avoid calls to "global" so force people to
> disable the warning whenever they try to use it.
> ---
>  catalyst/support.py | 2 --
>  catalyst/version.py | 2 ++
>  setup.py            | 3 ++-
>  3 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/catalyst/support.py b/catalyst/support.py
> index a879eaf..1e3eeef 100644
> --- a/catalyst/support.py
> +++ b/catalyst/support.py
> @@ -294,8 +294,6 @@ def ismount(path):
>  
>  def addl_arg_parse(myspec,addlargs,requiredspec,validspec):
>  	"helper function to help targets parse additional arguments"
> -	global valid_config_file_values
> -
>  	messages = []
>  	for x in addlargs.keys():
>  		if x not in validspec and x not in
> valid_config_file_values and x not in requiredspec: diff --git
> a/catalyst/version.py b/catalyst/version.py index d5c5cde..5deb4d7
> 100644 --- a/catalyst/version.py
> +++ b/catalyst/version.py
> @@ -18,6 +18,7 @@ _ver = None
>  
>  def get_git_version(version=__version__):
>  	"""Return: a string describing our version."""
> +	# pylint: disable=global-statement
>  	global _ver
>  	cwd = os.path.dirname(os.path.abspath(__file__))
>  	version_info = get_ver(cwd)
> @@ -39,6 +40,7 @@ def get_version(reset=False):
>  	'''Returns a saved release version string or the
>  	generated git release version.
>  	'''
> +	# pylint: disable=global-statement
>  	global __version__, _ver
>  	if _ver and not reset:
>  		return _ver
> diff --git a/setup.py b/setup.py
> index 27ed2de..e4569ee 100755
> --- a/setup.py
> +++ b/setup.py
> @@ -55,7 +55,6 @@ _data_files.extend(_files('share/catalyst/targets',
> 'targets')) class set_version(_Command):
>  	'''Saves the specified release version information
>  	'''
> -	global __version__
>  	description = "hardcode script's version using VERSION from
> environment" user_options = []  # [(long_name, short_name, desc),]
>  
> @@ -66,6 +65,8 @@ class set_version(_Command):
>  		pass
>  
>  	def run(self):
> +		# pylint: disable=global-statement
> +		global __version__
>  		try:
>  			version = _os.environ['VERSION']
>  		except KeyError:

yes, :) looks good

-- 
Brian Dolbec <dolsen>