Changeset 839

Timestamp:

09/11/16 10:13:26 (3 years ago)

Author:

mjuckes

Message:

more imports fixed

Location:

CMIP6dreqbuild/trunk/src/framework/dreqPy

Files:

• overviewTabs.py (modified) (1 diff)
• packageConfig.py (modified) (1 diff)
• volsum.py (modified) (1 diff)

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

@@ -1 @@
-
 
 import collections, string
-import dreq
-import scope
 import xlsxwriter
-import makeTables
+
+try:
+  import dreq
+  import scope
+  import makeTables
+except:
+  import dreqPy.dreq as dreq
+  import dreqPy.scope as scope
+  import dreqPy.makeTables as makeTables
 
 jsh='''

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

@@ -15 +15 @@
 
 __versionComment__ = "Updates to AerChemMIP experiment names; removed some variable duplication; cleaned uid strings"
-__version__ = "01.beta.40"
+__version__ = "01.beta.41"
 __title__ = "dreqPy"
 __description__ = "CMIP6 Data Request Python API"

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

@@ -1 +1 @@
 
-import scope
-import dreq
 import xlsxwriter
 from xlsxwriter.utility import xl_rowcol_to_cell
 import collections, os
-import makeTables
-import overviewTabs
+
+try:
+  import dreq
+
+  import scope
+  import makeTables
+  import overviewTabs
+except:
+  import dreqPy.dreq as dreq
+  import dreqPy.scope as scope
+  import dreqPy.makeTables as makeTables
+  import dreqPy.overviewTabs as overviewTabs
 
 ###cell = xl_rowcol_to_cell(1, 2)  # C2