Changeset 735 for CMIP6dreqbuild

Timestamp:

17/08/16 21:45:16 (3 years ago)

Author:

mjuckes

Message:

dual python imports ....

File:

• CMIP6dreqbuild/trunk/src/framework/dreqPy/dreqCmdl.py (modified) (2 diffs)

CMIP6dreqbuild/trunk/src/framework/dreqPy/dreqCmdl.py

@@ -3 +3 @@
 """
 
-## this enable python3 cleanly (replacing "import scope")
-## but does not work as __main__
+scr = __name__ == '__main__'
 import sys
-from . import scope
+if scr:
+  import scope
+else:
+  from . import scope
+
 
 def main_entry():
@@ -19 +22 @@
 
   if sys.argv[1] == '-v':
-      from .packageConfig import __version__, __versionComment__
+      if scr:
+        from packageConfig import __version__, __versionComment__
+      else:
+        from .packageConfig import __version__, __versionComment__
       print( 'dreqPy version %s [%s]' % (__version__,__versionComment__) )
   elif sys.argv[1] == '--unitTest':
       print( "Starting test suite 1" )
-      import simpleCheck
+      if scr:
+        import simpleCheck
+      else:
+        from . import simpleCheck
       print( "Starting test suite 2" )
-      from .examples import ex203
+      if scr:
+        import examples.ex203
+      else:
+        from .examples import ex203
       print( "Tests completed" )
   else: