Changeset 740

Timestamp:

18/08/16 02:21:40 (4 years ago)

Author:

mjuckes

Message:

further for python 3 ... flexible imports

File:

• CMIP6dreqbuild/trunk/src/framework/dreqPy/simpleCheck.py (modified) (3 diffs)

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

@@ -1 @@
-from .__init__ import DOC_DIR
+scr = __name__ == '__main__'
+if scr:
+  from __init__ import DOC_DIR
+else:
+  from .__init__ import DOC_DIR
 import string, os, sys, collections
 
@@ -79 +83 @@
 class check1(checkbase):
   def _ch01_importDreq(self):
-    from . import dreq
+    if scr:
+      import dreq
+    else:
+      from . import dreq
     print ( 'Dreq software import checked' )
     self.ok = True
 
   def _ch02_importSample(self):
-    from . import dreq
+    if scr:
+      import dreq
+    else:
+      from . import dreq
     self.dq = dreq.loadDreq( manifest='%s/dreqManifest.txt' % self.docdir  )
     print ( 'Dreq sample load checked' )
@@ -90 +100 @@
 
   def _ch03_linkCheck(self):
+    if scr:
+      import dreq
+    else:
+      from . import dreq
+
     nn = 0
-    from . import dreq
     self.dq = dreq.loadDreq( manifest='%s/dreqManifest.txt' % self.docdir  )
     for section in self.dq.coll :