Changeset 1344 for CMIP6dreqbuild/trunk/src/framework/utils_wb.py

Timestamp:

19/03/20 21:16:25 (13 months ago)

Author:

mjuckes

Message:

migrate to python 3

File:

• CMIP6dreqbuild/trunk/src/framework/utils_wb.py (modified) (8 diffs)

CMIP6dreqbuild/trunk/src/framework/utils_wb.py

@@ -1 @@
-import string, itertools
-import xlrd, string, shelve, os, re, sys
+import itertools
+import xlrd, shelve, os, re, sys
 import collections
 import xlutils, xlwt
@@ -13 +13 @@
 def uniCleanFunc(ss,jsFilt=False):
       if type(ss) in [type('x'),type(u'x')]:
-          ss = string.replace( ss, u'\u2013', '-' )
-          ss = string.replace( ss, u'\u2010', '-' )
-          ss = string.replace( ss, u'\u2018', "'" )
-          ss = string.replace( ss, u'\u201c', "'" )
-          ss = string.replace( ss, u'\u201d', "'" )
-          ss = string.replace( ss, u'\u2019', "'" )
-          ss = string.replace( ss, u'\u2026', '...' )
-          ss = string.replace( ss, u'\u25e6', 'o' )
-          ss = string.replace( ss, u'\xad', '-' )
-          ss = string.replace( ss, u'\xb2', '2' )
-          ss = string.replace( ss, u'\xb3', '3' )
+          ss = ss.replace( u'\u2013', '-' )
+          ss = ss.replace( u'\u2010', '-' )
+          ss = ss.replace( u'\u2018', "'" )
+          ss = ss.replace( u'\u201c', "'" )
+          ss = ss.replace( u'\u201d', "'" )
+          ss = ss.replace( u'\u2019', "'" )
+          ss = ss.replace( u'\u2009', " " )
+          ss = ss.replace( u'\u2026', '...' )
+          ss = ss.replace( u'\u25e6', 'o' )
+          ss = ss.replace( u'\xfc', 'u' )
+          ss = ss.replace( u'\xad', '-' )
+          ss = ss.replace( u'\xb1', '+-' )
+          ss = ss.replace( u'\xb2', '2' )
+          ss = ss.replace( u'\xb0', 'o' )
+          ss = ss.replace( u'\xb3', '3' )
           if jsFilt:
-            ss = string.replace( ss, '"', "'" )
-            ss = string.replace( ss, '\n', ";;" )
+            ss = ss.replace( '"', "'" )
+            ss = ss.replace( '\n', ";;" )
           return ss
       else:
@@ -108 +112 @@
     
     if oname not in self.sns:
-      print '%s not in %s' % (oname,str(self.sns) )
+      print ( '%s not in %s' % (oname,str(self.sns) ) )
       raise
     
@@ -147 +151 @@
                 return sheet
     except:
-        print '################# failed to find sheet: %s ############' % name
+        print ( '################# failed to find sheet: %s ############' % name )
         return None
 
@@ -209 +213 @@
         ee[k] = l
       except:
-        print l
+        print ( l )
         raise
   return ee
@@ -217 +221 @@
   for i in ov:
     ll.append( '%s|%s|%s' % tuple( map( str, i) ) )
-  return string.join(ll, '; ' )
+  return '; '.join(ll )
   
 
@@ -317 +321 @@
         if not novar:
           if mip == "SIMIP":
-            print htmlline
-          htmlline = string.replace( htmlline, u'\u2013', '-' )
-          htmlline = string.replace( htmlline, u'\u2018', "'" )
-          htmlline = string.replace( htmlline, u'\u2019', "'" )
-          htmlline = string.replace( htmlline, u'\u2026', '...' )
-          htmlline = string.replace( htmlline, u'\u25e6', 'o' )
-          htmlline = string.replace( htmlline, u'\xb2', '2' )
-          htmlline = string.replace( htmlline, u'\xb3', '3' )
+            print ( htmlline )
+          htmlline = htmlline.replace( u'\u2013', '-' )
+          htmlline = htmlline.replace( u'\u2018', "'" )
+          htmlline = htmlline.replace( u'\u2019', "'" )
+          htmlline = htmlline.replace( u'\u2026', '...' )
+          htmlline = htmlline.replace( u'\u25e6', 'o' )
+          htmlline = htmlline.replace( u'\xb2', '2' )
+          htmlline = htmlline.replace( u'\xb3', '3' )
           if self.oo != None:
             self.oo.write( "<tr>%s</tr>" % str(htmlline) + '\n' )
@@ -336 +340 @@
       s = r[1].value
       if mipt[:4]  in ['SPEC','CORD', 'CCMI'] and s != 'none':
-        print self.mip,mipt
+        print ( [self.mip,mipt] )