dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1665 from BuhtigithuB/clean/python-2-6-remaining-code-in-import-all-py

Browse Source 
Close #1664 remaining py2.6 specific code
This commit is contained in:
mdipierro
2017-07-10 14:14:44 -05:00
committed by GitHub
parent 579c54f926 b5b98d6e19
commit e2c9875cd5
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/import_all.py
+1 -5
View File
@@ -78,13 +78,9 @@ alert_dependency = ['hashlib', 'uuid']
# Now we remove the blacklisted modules if we are using the stated # Now we remove the blacklisted modules if we are using the stated
# python version. # python version.
# #
# List of modules deprecated in Python 2.6 or 2.7 that are in the above set # List of modules deprecated in Python 2.7 that are in the above list
py27_deprecated = ['mhlib', 'multifile', 'mimify', 'sets', 'MimeWriter'] # And ['optparse'] but we need it for now py27_deprecated = ['mhlib', 'multifile', 'mimify', 'sets', 'MimeWriter'] # And ['optparse'] but we need it for now
if python_version >= '2.6':
base_modules += ['json', 'multiprocessing']
base_modules = list(set(base_modules).difference(set(py26_deprecated)))
if python_version >= '2.7': if python_version >= '2.7':
base_modules += ['argparse', 'json', 'multiprocessing'] base_modules += ['argparse', 'json', 'multiprocessing']
base_modules = list(set(base_modules).difference(set(py27_deprecated))) base_modules = list(set(base_modules).difference(set(py27_deprecated)))