Changeset 738

Timestamp:

18/08/16 02:16:05 (4 years ago)

Author:

mjuckes

Message:

for python3

Location:

CMIP6dreq/trunk

Files:

• dreqPy/dreqCmdl.py (modified) (2 diffs)
• dreqPy/examples/ex002.py (modified) (3 diffs)
• dreqPy/examples/ex101.py (modified) (1 diff)
• dreqPy/examples/ex102.py (modified) (3 diffs)
• dreqPy/examples/ex202.py (modified) (1 diff)
• dreqPy/scope.py (modified) (2 diffs)
• dreqPy/simpleCheck.py (modified) (3 diffs)
• dreqPy/utilP2 (added)
• dreqPy/utilP2.py (deleted)
• dreqPy/utilP2/__init__.py (added)
• dreqPy/utilP2/util.py (added)
• setup.py (modified) (1 diff)

CMIP6dreq/trunk/dreqPy/dreqCmdl.py

@@ -3 +3 @@
 """
 
-import scope, sys
+scr = __name__ == '__main__'
+import sys
+if scr:
+  import scope
+else:
+  from . import scope
+
 
 def main_entry():
@@ -16 +22 @@
 
   if sys.argv[1] == '-v':
-      from packageConfig import __version__, __versionComment__
+      if scr:
+        from packageConfig import __version__, __versionComment__
+      else:
+        from .packageConfig import __version__, __versionComment__
       print( 'dreqPy version %s [%s]' % (__version__,__versionComment__) )
   elif sys.argv[1] == '--unitTest':
       print( "Starting test suite 1" )
-      import simpleCheck
+      if scr:
+        import simpleCheck
+      else:
+        from . import simpleCheck
       print( "Starting test suite 2" )
-      import examples.ex203
+      if scr:
+        import examples.ex203
+      else:
+        from .examples import ex203
       print( "Tests completed" )
   else:

CMIP6dreq/trunk/dreqPy/examples/ex002.py

@@ -8 +8 @@
       import dreq
     else:
-      print 'No dreq.py in specified directory'
+      print ( 'No dreq.py in specified directory' )
       sys.exit(0)
   else:
-    print 'Specified directoty does not exist'
+    print  ('Specified directoty does not exist' )
     sys.exit(0)
 else:
@@ -21 +21 @@
 
 dcppLinks = [x for x in dq.coll['requestLink'].items if x.mip == 'DCPP']
-print 'Request links found for DCPP: %s' % len( dcppLinks )
+print ('Request links found for DCPP: %s' % len( dcppLinks ) )
 
 dcppRequestedGroups = set( [dq.inx.uid[x.refid] for x in dcppLinks] )
-print 'Request groups found for DCPP: %s' % len( dcppRequestedGroups )
+print ('Request groups found for DCPP: %s' % len( dcppRequestedGroups ) )
 
 dcppRequestedCmorVars = set()
@@ -30 +30 @@
    for x in dq.inx.iref_by_sect[vg.uid].a['requestVar']:
        dcppRequestedCmorVars.add( dq.inx.uid[x].vid )
-print 'Requested CMOR Variables found for DCPP: %s' % len( dcppRequestedCmorVars )
+print ('Requested CMOR Variables found for DCPP: %s' % len( dcppRequestedCmorVars ) )
 

CMIP6dreq/trunk/dreqPy/examples/ex101.py

@@ -6 +6 @@
 
 ver = doc.getElementsByTagName('pav:version')[0]
-print ver.firstChild.data
+print ( ver.firstChild.data )

CMIP6dreq/trunk/dreqPy/examples/ex102.py

@@ -9 +9 @@
     xmlf = fn
   else:
-    print 'File %s not found' % fn
+    print ( 'File %s not found' % fn )
     sys.exit(0)
 else:
@@ -26 +26 @@
     dcppLinks.append( item )
     requestedGroups.add( item.getAttribute( 'refid' ) )
-print 'Request links found for DCPP: %s' % len( dcppLinks )
 
-print 'Request groups found for DCPP: %s' % len( requestedGroups )
+print ( 'Request links found for DCPP: %s' % len( dcppLinks ) )
+
+print ( 'Request groups found for DCPP: %s' % len( requestedGroups ) )
 
 sect = doc.getElementsByTagName( 'requestVar' )[0]
@@ -36 +37 @@
     cmorVars.add(  item.getAttribute( 'vid' ) )
 
-print 'CMOR variables requested by DCPP: %s' % len(cmorVars)
+print ( 'CMOR variables requested by DCPP: %s' % len(cmorVars) )

CMIP6dreq/trunk/dreqPy/examples/ex202.py

@@ -7 +7 @@
       import scope
     else:
-      print 'No scope.py in specified directory'
+      print ( 'No scope.py in specified directory' )
       sys.exit(0)
   else:
-    print 'Specified directoty does not exist'
+    print  ('Specified directoty does not exist' )
     sys.exit(0)
 else:

CMIP6dreq/trunk/dreqPy/scope.py

@@ -25 +25 @@
   mlg = mlog3()
 else:
-  from utilP2 import mlog
-  mlg = mlog()
+  from utilP2 import util
+  mlg = util.mlog()
 
 class c1(object):
@@ -978 +978 @@
 
     v0 = self.sc.volByMip( self.adict['m'], pmax=pmax, intersection=self.intersection, adsCount=adsCount, exptid=eid )
-    #mlg.prnt ( '%7.2fTb' % (v0*2.*1.e-12) )
     mlg.prnt ( 'getVolByMip: %s [%s]' % (v0,makeTables.vfmt(v0*2.)) )
     cc = collections.defaultdict( int )

CMIP6dreq/trunk/dreqPy/simpleCheck.py

@@ -1 @@
-from __init__ import DOC_DIR
+from .__init__ import DOC_DIR
 import string, os, sys, collections
 
@@ -79 +79 @@
 class check1(checkbase):
   def _ch01_importDreq(self):
-    import dreq
+    from . import dreq
     print ( 'Dreq software import checked' )
     self.ok = True
 
   def _ch02_importSample(self):
-    import dreq
+    from . import dreq
     self.dq = dreq.loadDreq( manifest='%s/dreqManifest.txt' % self.docdir  )
     print ( 'Dreq sample load checked' )
@@ -91 +91 @@
   def _ch03_linkCheck(self):
     nn = 0
-    import dreq
+    from . import dreq
     self.dq = dreq.loadDreq( manifest='%s/dreqManifest.txt' % self.docdir  )
     for section in self.dq.coll :

CMIP6dreq/trunk/setup.py

@@ -8 +8 @@
 
 NAME = "dreqPy"
-PACKAGES = find_packages(exclude=["tests*"])
+python2 = True
+if sys.version_info[0] == 3:
+  PACKAGES = find_packages(exclude=["tests*","dreqPy.utilP2"])
+  python2 = False
+else:
+  PACKAGES = find_packages(exclude=["tests*"])
+
 META_PATH = os.path.join("dreqPy", "packageConfig.py")
 KEYWORDS = ["CMIP6"]