Changeset 935

Timestamp:

20/01/17 20:24:16 (4 years ago)

Author:

mjuckes

Message:

python3 enabled makeTables

File:

• CMIP6dreqbuild/trunk/src/framework/dreqPy/dreq.py (modified) (10 diffs)

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

@@ -210 +210 @@
              else:
                ttl = self.label
-             ttl = string.replace( ttl,'"', '"' )
-             ttl = string.replace( ttl,'<', '&lt;' )
-             self._htmlTtl = string.replace( ttl,'>', '&gt;' )
+             ttl = ttl.replace( '"', '&quot;' )
+             ttl = ttl.replace( '<', '&lt;' )
+             self._htmlTtl = ttl.replace( '>', '&gt;' )
            title=self._htmlTtl
          if label == None:
@@ -222 +222 @@
 
        def htmlLinkAttrListStyle(self,a,targ,frm=None):
-           xx = string.join( ['%s [%s]' % (x.label, x.__href__()) for x in targ], '; ')
+           xx = '; '.join( ['%s [%s]' % (x.label, x.__href__()) for x in targ])
            return '<li>%s: [%s] %s</li>' % ( a, targ[0]._h.label, xx )
 
@@ -318 +318 @@
                    am.append( '<ul>' )
                    items = [self._inx.uid[u] for  u in self._inx.iref_by_sect[self.uid].a[t] ]
-                   items.sort( ds('label').cmp )
+                   ##items.sort( ds('label').cmp )
+                   items = sorted( items, key=ds('label').key )
                    for targ in items:
                      if ghis == None:
@@ -865 +866 @@
   def cmp(self,x,y):
     return cmp( x.__dict__[self.k], y.__dict__[self.k] )
+  def key(self,x):
+    return x.__dict__[self.k]
 
 class kscl(object):
@@ -873 +876 @@
   def cmp(self,x,y):
     return cmp( self.idict[x].__dict__[self.k], self.idict[y].__dict__[self.k] )
+  def key(self,x):
+    return self.idict[x].__dict__[self.k]
 
 src1 = '../workbook/trial_20150831.xml'
@@ -1010 +1015 @@
        return str(v)
     elif typ == "aa:st__stringList":
-       return string.join(v)
+       return ' '.join(v)
     elif typ in ["aa:st__integerList","aa:st__integerListMonInc", "aa:st__floatList"]:
-       return string.join( [str(x) for x in v] )
+       return ' '.join( [str(x) for x in v] )
     else:
        assert False, 'Data type not recognised'
@@ -1023 +1028 @@
 
       if self.c.rc.isIntStr(a):
-        a = int(a)
+        a = '%3.3i' % int(a)
       if self.c.rc.isIntStr(b):
-        b = int(b)
+        b = '%3.3i' % int(b)
       rv = (a,b)
     elif len(ab) == 1:
@@ -1041 +1046 @@
 
     ks = self.inx.uid.keys()
-    ks.sort( kscl( self.inx.uid, 'title' ).cmp )
+    ##ks.sort( kscl( self.inx.uid, 'title' ).cmp )
+    ks = sorted( ks, key=kscl( self.inx.uid, 'title' ).key )
     for k in ks:
       i = self.inx.uid[k]
       ttl = 'Data Request Record: [%s]%s' % (i._h.label,i.label)
-      bdy = string.join( i.__html__( ghis=self.getHtmlItemStyle ), '\n' )
+      bdy = '\n'.join( i.__html__( ghis=self.getHtmlItemStyle ) )
       oo = open( '%s/u/%s.html' % (odir,i.uid), 'w' )
       oo.write( self.pageTmpl % (ttl, jsh, '../', '../index.html', bdy ) )
@@ -1073 +1079 @@
         ann = {}
 
-      self.coll[k].items.sort( ds('label').cmp )
+      ##self.coll[k].items.sort( ds('label').cmp )
       ttl = 'Data Request Section: %s' % k
       msg0.append( '<li><a href="index/%s.html">%s [%s]</a></li>\n' % (k,self.coll[k].header.title,k) )
@@ -1081 +1087 @@
       lst = self.getHtmlItemStyle(k)
       
+      msg1 = []
       for i in self.coll[k].items:
         ##m = '<li>%s: %s</li>' % ( i.label, i.__href__(odir='../u/') )
        
         m = lst( i, ann=ann.get( i.label ) )
-        msg.append( m )
+        msg1.append( m )
+      msg += sorted( msg1 )
       msg.append( '</ul>' )
-      bdy = string.join( msg, '\n' )
+      bdy = '\n'.join( msg )
       oo = open( '%s/index/%s.html' % (odir,k), 'w' )
       oo.write( self.pageTmpl % (ttl, '', '../', '../index.html', bdy ) )
       oo.close()
     msg0.append( '</ul>' )
-    bdy = string.join( msg0, '\n' )
+    bdy = '\n'.join( msg0 )
     oo = open( '%s/index.html' % odir, 'w' )
     oo.write( self.pageTmpl % (ttl0, '', '', 'index.html', bdy ) )