Changeset 1270

Timestamp:

16/10/18 15:26:28 (8 months ago)

Author:

mjuckes

Message:

fixing python 3 compatibility issue

Location:

CMIP6dreqbuild/trunk/src/framework/dreqPy

Files:

• dreq.py (modified) (1 diff)
• misc_utils.py (modified) (4 diffs)
• overviewTabs.py (modified) (1 diff)
• scope.py (modified) (2 diffs)
• scope_utils.py (modified) (1 diff)
• simpleCheck.py (modified) (2 diffs)

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

@@ -4 +4 @@
 2. Index
 """
-import xml, string, collections
+import xml, collections
 import xml.dom
 import xml.dom.minidom

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

@@ -1 @@
-import collections, string , os, sys
+import collections, os, sys
 import logging
 import time
@@ -126 +126 @@
         print ( '%s: %s, %s' % (kk, ic.title, i.title) )
         kd += 1
-      if string.find( ic.modeling_realm, ' ' ) != -1:
-         for x in string.split( ic.modeling_realm ):
-            r.add( string.strip( x ) )
+      if ic.modeling_realm.find( ' ' ) != -1:
+         for x in ic.modeling_realm.split( ):
+            r.add( x.strip( ) )
       elif ic.modeling_realm not in ['__unset__','']:
           r.add( ic.modeling_realm )
@@ -161 +161 @@
       for cmv in dq.inx.iref_by_sect[i.uid].a['CMORvar']:
         ic = dq.inx.uid[cmv]
-        if string.find( ic.modeling_realm, ' ' ) != -1:
-          for x in string.split( ic.modeling_realm ):
-            r.add( string.strip( x ) )
+        if ic.modeling_realm.find( ' ' ) != -1:
+          for x in ic.modeling_realm.split( ):
+            r.add( x.strip( ) )
         elif ic.modeling_realm not in ['__unset__','']:
           r.add( ic.modeling_realm )
@@ -364 +364 @@
               self.exrqi[id].add( i.uid )
     ks = sorted( list( self.expts.keys() ) )
-    xx = string.join( ['%s: %s' % (k,len(self.expts[k])) for k in ks], ', ' )
+    xx = ', '.join( ['%s: %s' % (k,len(self.expts[k])) for k in ks] )
     print ( '%s:: %s' % (mip,xx) )
 

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

@@ -1 @@
-
-import collections, string, os
+import collections, os
 import xlsxwriter
 

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

@@ -28 +28 @@
   import dreqPy.misc_utils as misc_utils
 
-import collections, string, operator
+import collections, operator
 import sys, os
 
@@ -1801 +1801 @@
 
     if 'mcfg' in self.adict:
-      ll = string.split( self.adict['mcfg'], ',' )
+      ll = self.adict['mcfg'].split( ',' )
       assert len(ll) == 7, 'Length of model configuration argument must be 7 comma separated integers: %s' %  self.adict['mcfg']
       lli = [ int(x) for x in ll]

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

@@ -1 @@
-import collections, string
+import collections
 try:
   import table_utils

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

@@ -10 +10 @@
   ##DOC_DIR = __init__.DOC_DIR
 
-import string, os, sys, collections
+import os, sys, collections
+
+usingPython3 = sys.version_info >= (3,0)
 
 try:
@@ -145 +147 @@
     os.unlink( '.simpleCheck_check2.txt' )
 
+  def _getCmd(self):
+    if self.entryPoint == 'drq':
+       self.cmd = 'drq'
+    else:
+       if usingPython3:
+         self.cmd = 'python3 dreqCmdl.py'
+       else:
+         self.cmd = 'python dreqCmdl.py'
+
+  def _ch05_checkMcfg(self):
+    self._getCmd()
+    thisCmd = '%s -m CMIP -e historical --mcfg 259200,60,64800,40,20,5,100' % self.cmd
+    os.popen( '%s 2> .simpleCheck_check5_err.txt 1>.simpleCheck_check5.txt' % thisCmd ).readlines()
+
+    ii = open( '.simpleCheck_check5_err.txt' ).readlines()
+    if len(ii) > 0:
+      print ( 'WARNING[005]: failed to get volume est. with command line call' )
+      self.ok = False
+      ##self._clear_ch04()
+      return
+
+    ii = open( '.simpleCheck_check5.txt' ).readlines()
+    if len(ii) < 1:
+      print ( 'WARNING[006]: failed to get get volume est. with command line call' )
+      self.ok = False
+      ##self._clear_ch04()
+      return
+
+    self.ok = True
+    return
+
   def _ch04_checkCmd(self):
     import os
-    if self.entryPoint == 'drq':
-       cmd = 'drq'
-    else:
-       cmd = 'python dreqCmdl.py'
-
-    os.popen( '%s -v  2> .simpleCheck_check2_err.txt 1>.simpleCheck_check2.txt' % cmd ).readlines()
+    self._getCmd()
+
+    os.popen( '%s -v  2> .simpleCheck_check2_err.txt 1>.simpleCheck_check2.txt' % self.cmd ).readlines()
 
     ii = open( '.simpleCheck_check2_err.txt' ).readlines()