Changeset 21bba86 in sasview

Timestamp:

Apr 11, 2017 5:51:01 AM (7 years ago)

Author:

ajj

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

01f1e17

Parents:

f4d571b

Message:

More print fixes

Files:

• docs/sphinx-docs/build_sphinx.py (modified) (5 diffs)
• setup.py (modified) (1 diff)

docs/sphinx-docs/build_sphinx.py

@@ -12 +12 @@
 import shutil
 import imp
+from __future__ import print_function
+
 from glob import glob
-
 from distutils.dir_util import copy_tree
 from distutils.util import get_platform
@@ -55 +56 @@
 SASMODELS_DEST_BUILDIMG = os.path.join(SASMODELS_DEST_PROLOG, "user", "models", "img")
 
-#if os.path.exists(SASMODELS_SOURCE_PROLOG):
-#    print "Found models prolog folder at", SASMODELS_SOURCE_PROLOG
-#if os.path.exists(SASMODELS_SOURCE_REF_MODELS):
-#    print "Found models ref folder at", SASMODELS_SOURCE_REF_MODELS
-#if os.path.exists(SASMODELS_SOURCE_MODELS):
-#    print "Found models folder at", SASMODELS_SOURCE_MODELS
-#if os.path.exists(SASMODELS_SOURCE_IMG):
-#    print "Found img folder at", SASMODELS_SOURCE_IMG
-#if os.path.exists(SASMODELS_DEST_REF_MODELS):
-#    print "Found models ref folder at", SASMODELS_DEST_REF_MODELS
-#if os.path.exists(SASMODELS_DEST_MODELS):
-#    print "Found models folder at", SASMODELS_DEST_MODELS
-#if os.path.exists(SASMODELS_DEST_IMG):
-#    print "Found img folder at", SASMODELS_DEST_IMG
-#sys.exit()
 
 SPHINX_BUILD = os.path.join(CURRENT_SCRIPT_DIR, "build")
@@ -88 +74 @@
         s=open(filename).read()
         if old_string in s:
-                print 'Changing "{old_string}" to "{new_string}"'.format(**locals())
+                print('Changing "{old_string}" to "{new_string}"'.format(**locals()))
                 s=s.replace(old_string, new_string)
                 f=open(filename, 'w')
@@ -95 +81 @@
                 f.close()
         else:
-                print 'No occurences of "{old_string}" found.'.format(**locals())
+                print('No occurences of "{old_string}" found.'.format(**locals()))
 
 def _remove_dir(dir_path):
     """Removes the given directory."""
     if os.path.isdir(dir_path):
-        print "Removing \"%s\"... " % dir_path
+        print("Removing \"%s\"... " % dir_path)
         shutil.rmtree(dir_path)
 
@@ -208 +194 @@
                     shutil.copy(fromhere,tohere)
     else:
-        print "no source directory",SASMODELS_SOURCE_PROLOG, "was found"
+        print("no source directory",SASMODELS_SOURCE_PROLOG, "was found")
 
     if os.path.exists(SASMODELS_SOURCE_GPU):

setup.py

@@ -159 +159 @@
         # check for doc path
         SASMODELS_DOCPATH = os.path.abspath(os.path.join(os.getcwd(),'..','sasmodels','doc'))
-        print "========= check for sasmodels at "+SASMODELS_DOCPATH+"============"
+        print("========= check for sasmodels at",SASMODELS_DOCPATH,"============")
         if os.path.exists(SASMODELS_DOCPATH):
             if os.path.isdir(SASMODELS_DOCPATH):
                 # if available, build sasmodels docs
-                print "============= Building sasmodels model documentation ==============="
+                print("============= Building sasmodels model documentation ===============")
                 smdocbuild = subprocess.call(["make","-C",SASMODELS_DOCPATH,"html"])
         else:
             # if not available warning message
-            print " == !!WARNING!! sasmodels directory not found. Cannot build model docs. =="
+            print("== !!WARNING!! sasmodels directory not found. Cannot build model docs. ==")
 
         #Now build sasview (+sasmodels) docs