Changeset 794

Timestamp:

27/10/16 17:22:11 (3 years ago)

Author:

mjuckes

Message:

corrected imports for python 3

File:

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

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

@@ -1 +1 @@
 scr = __name__ == '__main__'
-if scr:
+try:
   from __init__ import DOC_DIR
-else:
-  from .__init__ import DOC_DIR
+except:
+  from dreqPy.__init__ import DOC_DIR
+##if scr:
+  ##from __init__ import DOC_DIR
+##else:
+  ##from . import __init__
+  ##DOC_DIR = __init__.DOC_DIR
+
 import string, os, sys, collections
 
@@ -83 +89 @@
 class check1(checkbase):
   def _ch01_importDreq(self):
-    if scr:
+    try:
       import dreq
-    else:
+    except:
       from . import dreq
     print ( 'Dreq software import checked' )
@@ -91 +97 @@
 
   def _ch02_importSample(self):
-    if scr:
+    try:
       import dreq
-    else:
+    except:
       from . import dreq
     self.dq = dreq.loadDreq( manifest='%s/dreqManifest.txt' % self.docdir  )
@@ -100 +106 @@
 
   def _ch03_linkCheck(self):
-    if scr:
+    try:
       import dreq
-    else:
+    except:
       from . import dreq