Move Python version checking to a separate module
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:
parent
da45e5d884
commit
59bbb580e3
10 changed files with 62 additions and 49 deletions
|
@ -21,12 +21,13 @@ except ImportError:
|
|||
import dummy_threading as _threading
|
||||
|
||||
import glob
|
||||
try:
|
||||
# For python2
|
||||
import StringIO as io
|
||||
except ImportError:
|
||||
# For python3
|
||||
|
||||
from pyversion import is_python3
|
||||
if is_python3():
|
||||
import io
|
||||
else:
|
||||
import StringIO as io
|
||||
|
||||
import itertools
|
||||
import os
|
||||
import sys
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue