Handle relative imports for Python 2.

Jürgen Knödlseder
1 parent 30daf3a5
Showing 2 changed files with 5 additions and 2 deletions
configure.ac
cscripts/__init__.py.in
@@ -624,11 +624,14 @@ else
  
     # Set opening and closing symbols to make setup.py compatible for versions 2 and 3
     if test ${PYTHON_VERSION} '<' 3; then
-      PYTHON_RELATIVE_IMPORT=" "
+      PYTHON_RELATIVE_IMPORT=""
+      PYTHON_FROM_DOT_=""
     else
       PYTHON_RELATIVE_IMPORT="."
+      PYTHON_FROM_DOT_="from . "
     fi
     AC_SUBST(PYTHON_RELATIVE_IMPORT)  
+    AC_SUBST(PYTHON_FROM_DOT_)  
  
     # Do we have distutils?
     AC_MSG_CHECKING([for the distutils Python package])
@@ -63,7 +63,7 @@ from @PYTHON_RELATIVE_IMPORT@cssens       import cssens
 from @PYTHON_RELATIVE_IMPORT@csspec       import csspec
 from @PYTHON_RELATIVE_IMPORT@cstsdist     import cstsdist
 from @PYTHON_RELATIVE_IMPORT@cstsmapmerge import cstsmapmerge
-from . import obsutils
+@PYTHON_FROM_DOT_@import obsutils
 if cur_version > req_version:
     from @PYTHON_RELATIVE_IMPORT@csfindobs    import csfindobs
     from @PYTHON_RELATIVE_IMPORT@csiactcopy   import csiactcopy