Tools/git-repo
1
0
Fork 0
Code Activity

Move Python version checking to a separate module

Browse source 
Add a new module with methods for checking the Python version.

Instead of handling Python3 imports with try...except blocks, first
check the python version and then import the relevant modules.  This
makes the code a bit cleaner and will result in less diff when/if we
remove support for Python < 3 later.

Use the same mechanism to handle `input` vs. `raw_input` and add
suppression of pylint warnings caused by redefinition of the built-in
method `input`.

Change-Id: Ia403e525b88d77640a741ac50382146e7d635924
Also-by: Chirayu Desai <cdesai@cyanogenmod.org>
Signed-off-by: Chirayu Desai <cdesai@cyanogenmod.org>
This commit is contained in:
David Pursehouse 2013-05-17 10:49:33 +09:00
parent da45e5d884
commit 59bbb580e3
10 changed files with 62 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

7
subcmds/upload.py
View file

@ -23,10 +23,11 @@ from editor import Editor
from error import HookError, UploadError
from project import RepoHook
try:
from pyversion import is_python3
if not is_python3():
# pylint:disable=W0622
input = raw_input
except NameError:
pass
# pylint:enable=W0622
UNUSUAL_COMMIT_THRESHOLD = 5