From a46bf7dc2af111ae4a663d61ed06dc90ddfb8068 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Sat, 15 Feb 2020 12:45:53 +0900 Subject: [PATCH] flake8: Suppress "F821 undefined name" inline for Python 2 names All of the instances of this are related to Python 2 names that don't exist in Python 3, and the warnings are raised when running flake8 on Python 3. All of these will go away once we completely remove support for Python 2, so just suppress them inline. We don't globally suppress the check so that we will still see legitimate errors if/when they occur in new code. Change-Id: Iccf955f50abfc9f83b371fc0af6cceb51037456f Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/255039 Tested-by: David Pursehouse Reviewed-by: Mike Frysinger --- main.py | 2 +- platform_utils_win32.py | 4 ++-- project.py | 2 +- subcmds/gitc_delete.py | 2 +- subcmds/upload.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/main.py b/main.py index abb99cc5..3efb1c35 100755 --- a/main.py +++ b/main.py @@ -69,7 +69,7 @@ from wrapper import WrapperPath, Wrapper from subcmds import all_commands if not is_python3(): - input = raw_input + input = raw_input # noqa: F821 global_options = optparse.OptionParser( usage='repo [-p|--paginate|--no-pager] COMMAND [ARGS]', diff --git a/platform_utils_win32.py b/platform_utils_win32.py index c59db523..a6286374 100644 --- a/platform_utils_win32.py +++ b/platform_utils_win32.py @@ -219,8 +219,8 @@ def _preserve_encoding(source, target): if is_python3(): return target - if isinstance(source, unicode): - return unicode(target) + if isinstance(source, unicode): # noqa: F821 + return unicode(target) # noqa: F821 return str(target) diff --git a/project.py b/project.py index 4af062ac..d0bf4651 100644 --- a/project.py +++ b/project.py @@ -52,7 +52,7 @@ else: import urlparse urllib = imp.new_module('urllib') urllib.parse = urlparse - input = raw_input + input = raw_input # noqa: F821 def _lwrite(path, content): diff --git a/subcmds/gitc_delete.py b/subcmds/gitc_delete.py index 1011276f..24d355a2 100644 --- a/subcmds/gitc_delete.py +++ b/subcmds/gitc_delete.py @@ -22,7 +22,7 @@ import platform_utils from pyversion import is_python3 if not is_python3(): - input = raw_input + input = raw_input # noqa: F821 class GitcDelete(Command, GitcClientCommand): diff --git a/subcmds/upload.py b/subcmds/upload.py index bc373b3e..ba75a53e 100644 --- a/subcmds/upload.py +++ b/subcmds/upload.py @@ -27,7 +27,7 @@ from project import RepoHook from pyversion import is_python3 if not is_python3(): - input = raw_input + input = raw_input # noqa: F821 else: unicode = str