Changeset 739 for CMIP6dreqbuild


Ignore:
Timestamp:
18/08/16 02:18:05 (3 years ago)
Author:
mjuckes
Message:

for python 3 ...

Location:
CMIP6dreqbuild/trunk/src/framework
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • CMIP6dreqbuild/trunk/src/framework/Makefile

    r724 r739  
    6363        bash seddreq.sh annotated_20150731.xml dreq.xml dreqPy/dreq.py >  /data/tmp/svn3/exarch/CMIP6dreq/trunk/dreqPy/dreq.py 
    6464        bash seddreq02.sh "\.\.\/out" "docs" dreqPy/packageConfig.py > /data/tmp/svn3/exarch/CMIP6dreq/trunk/dreqPy/packageConfig.py 
    65         cp htmlTemplates.py dreqPy/scope.py dreqPy/scope_utils.py dreqPy/utilities.py dreqPy/utilP2.py dreqPy/utilP3.py /data/tmp/svn3/exarch/CMIP6dreq/trunk/dreqPy     
     65        cp htmlTemplates.py dreqPy/scope.py dreqPy/scope_utils.py dreqPy/utilities.py dreqPy/utilP3.py /data/tmp/svn3/exarch/CMIP6dreq/trunk/dreqPy      
     66        cp dreqPy/utilP2/*.py /data/tmp/svn3/exarch/CMIP6dreq/trunk/dreqPy/utilP2/ 
    6667        cp dreqPy/dreqCmdl.py dreqPy/makeTables.py dreqPy/vrev.py dreqPy/__init__.py dreqPy/simpleCheck.py /data/tmp/svn3/exarch/CMIP6dreq/trunk/dreqPy 
    6768        cp dreqPy/misc_utils.py /data/tmp/svn3/exarch/CMIP6dreq/trunk/dreqPy 
  • CMIP6dreqbuild/trunk/src/framework/dreqPy/examples/ex002.py

    r736 r739  
    2121 
    2222dcppLinks = [x for x in dq.coll['requestLink'].items if x.mip == 'DCPP'] 
    23 print 'Request links found for DCPP: %s' % len( dcppLinks ) 
     23print ('Request links found for DCPP: %s' % len( dcppLinks ) ) 
    2424 
    2525dcppRequestedGroups = set( [dq.inx.uid[x.refid] for x in dcppLinks] ) 
    26 print 'Request groups found for DCPP: %s' % len( dcppRequestedGroups ) 
     26print ('Request groups found for DCPP: %s' % len( dcppRequestedGroups ) ) 
    2727 
    2828dcppRequestedCmorVars = set() 
     
    3030   for x in dq.inx.iref_by_sect[vg.uid].a['requestVar']: 
    3131       dcppRequestedCmorVars.add( dq.inx.uid[x].vid ) 
    32 print 'Requested CMOR Variables found for DCPP: %s' % len( dcppRequestedCmorVars ) 
     32print ('Requested CMOR Variables found for DCPP: %s' % len( dcppRequestedCmorVars ) ) 
    3333 
  • CMIP6dreqbuild/trunk/src/framework/dreqPy/simpleCheck.py

    r715 r739  
    1 from __init__ import DOC_DIR 
     1from .__init__ import DOC_DIR 
    22import string, os, sys, collections 
    33 
     
    7979class check1(checkbase): 
    8080  def _ch01_importDreq(self): 
    81     import dreq 
     81    from . import dreq 
    8282    print ( 'Dreq software import checked' ) 
    8383    self.ok = True 
    8484 
    8585  def _ch02_importSample(self): 
    86     import dreq 
     86    from . import dreq 
    8787    self.dq = dreq.loadDreq( manifest='%s/dreqManifest.txt' % self.docdir  ) 
    8888    print ( 'Dreq sample load checked' ) 
     
    9191  def _ch03_linkCheck(self): 
    9292    nn = 0 
    93     import dreq 
     93    from . import dreq 
    9494    self.dq = dreq.loadDreq( manifest='%s/dreqManifest.txt' % self.docdir  ) 
    9595    for section in self.dq.coll : 
  • CMIP6dreqbuild/trunk/src/framework/vocabDemo.py

    r373 r739  
    55 
    66 
    7 print vc.coll.keys() 
    8 print vc.coll['institute'].attDefn.keys() 
     7print ( vc.coll.keys() ) 
     8print ( vc.coll['institute'].attDefn.keys() ) 
    99for r in  vc.coll['institute'].items: 
    10    print '%20s: %s [%s]' % (r.label,r.description,r.isni) 
     10   print ( '%20s: %s [%s]' % (r.label,r.description,r.isni) ) 
Note: See TracChangeset for help on using the changeset viewer.