Import improvements

and the possibility to run the code in 2.7 even without installing the future module (though it is not recommended to not install it)
wupperinst · May 20, 2016 · b204509 · b204509
1 parent f775989
commit b204509
Show file tree

Hide file tree

Showing 8 changed files with 13,488 additions and 6 deletions.
diff --git a/code/osmTGmod.py b/code/osmTGmod.py
@@ -21,28 +21,31 @@
 
 # Imports Database Modules
 
-from builtins import input
-
 import psycopg2
 from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT as _il # Needed for creating Databases
 
 import subprocess
 import os
-import io
 
 import datetime
 import sys
 import stat
 import platform
 
 if (sys.version_info > (3, 0)):
-    # Python 3 import
+    # Python 3 only import
     import urllib.request
 else:
-    # Python 2 import
+    # Python 2 only import
     import urllib
     from urllib2 import urlopen
-
+    try:
+        from  builtins import input #First check if future module has been installed
+    except ImportError:
+        if hasattr(__builtins__, 'raw_input'):
+            input=raw_input
+    import io
+
 #import shutil
 
 import general_funcs

diff --git a/results/2_branch_data.csv b/results/2_branch_data.csv
diff --git a/results/2_bus_data.csv b/results/2_bus_data.csv
diff --git a/results/2_dcline_data.csv b/results/2_dcline_data.csv
diff --git a/results/2_nuts3_subst.csv b/results/2_nuts3_subst.csv
diff --git a/results/2_plz_subst.csv b/results/2_plz_subst.csv
diff --git a/results/2_problem_log.csv b/results/2_problem_log.csv
diff --git a/results/2_substations.csv b/results/2_substations.csv