From b5b98d6e19ced074b768034c726758732a614b4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Richard=20V=C3=A9zina?= Date: Wed, 21 Jun 2017 15:32:28 -0400 Subject: [PATCH] Close #1664 remaining py2.6 specific code --- gluon/import_all.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/gluon/import_all.py b/gluon/import_all.py index a8cbffc6..85f14864 100644 --- a/gluon/import_all.py +++ b/gluon/import_all.py @@ -78,13 +78,9 @@ alert_dependency = ['hashlib', 'uuid'] # Now we remove the blacklisted modules if we are using the stated # 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 -if python_version >= '2.6': - base_modules += ['json', 'multiprocessing'] - base_modules = list(set(base_modules).difference(set(py26_deprecated))) - if python_version >= '2.7': base_modules += ['argparse', 'json', 'multiprocessing'] base_modules = list(set(base_modules).difference(set(py27_deprecated)))