Merged with [default]

1 files changed, 15 insertions, 14 deletions

diff --git a/doc/SConscript b/doc/SConscript
index d5cd01c9..386aec71 100644
--- a/doc/SConscript
+++ b/doc/SConscript
@@ -23,6 +23,7 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+from __future__ import print_function
 
 import os.path
 import re
@@ -86,19 +87,19 @@ except:
     try:
         import lxml
     except:
-        print "doc: Neither libxml2 nor lxml Python bindings found!"
-        print "     Please install one of the packages python-libxml2 or python-lxml."
+        print("doc: Neither libxml2 nor lxml Python bindings found!")
+        print("     Please install one of the packages python-libxml2 or python-lxml.")
         skip_doc = True
         
 if not fop and not xep:
-    print "doc: No PDF renderer found (fop|xep)!"
+    print("doc: No PDF renderer found (fop|xep)!")
     skip_doc = True
     
 if skip_doc:
-    print "doc: ...skipping building User Guide."
+    print("doc: ...skipping building User Guide.")
 else:
     if not lynx:
-        print "doc: Warning, lynx is not installed...created release packages won't be complete!"
+        print("doc: Warning, lynx is not installed...created release packages won't be complete!")
     
     #
     # Always create a version.xml file containing the version information
@@ -172,18 +173,18 @@ else:
         # Ensure that all XML files are valid against our XSD, and
         # that all example names and example output suffixes are unique
         #
-        print "Validating files against SCons XSD..."
+        print("Validating files against SCons XSD...")
         if SConsDoc.validate_all_xml(['src'], xsdfile='xsd/scons.xsd'):
-            print "OK"
+            print("OK")
         else:
-            print "Validation failed! Please correct the errors above and try again."
+            print("Validation failed! Please correct the errors above and try again.")
             sys.exit(0)
             
-        print "Checking whether all example names are unique..."
+        print("Checking whether all example names are unique...")
         if SConsExamples.exampleNamesAreUnique(os.path.join('doc','user')):
-            print "OK"
+            print("OK")
         else:
-            print "Not all example names and suffixes are unique! Please correct the errors listed above and try again."
+            print("Not all example names and suffixes are unique! Please correct the errors listed above and try again.")
             sys.exit(0)
     
     # List of prerequisite files in the build/doc folder
@@ -509,7 +510,7 @@ else: # epydoc_cli is found
 
      
 if not epydoc_cli and not epydoc:
-    print "doc: epydoc not found, skipping building API documentation."
+    print("doc: epydoc not found, skipping building API documentation.")
 else:
     # XXX Should be in common with reading the same thing in
     # the SConstruct file.
@@ -531,7 +532,7 @@ else:
     tar_list.append(htmldir)
 
     if not epydoc_cli:
-        print "doc: command line epydoc is not found, skipping PDF/PS/Tex output"
+        print("doc: command line epydoc is not found, skipping PDF/PS/Tex output")
     else:
         # PDF and PostScript and TeX are built from the
         # same invocation.
@@ -564,7 +565,7 @@ if tar_deps:
     tar_list = ' '.join([x.replace(build+'/', '') for x in tar_list])
     t = env.Command(dist_doc_tar_gz, tar_deps,
                 "tar cf${TAR_HFLAG} - -C %s %s | gzip > $TARGET" % (build, tar_list))
-    AddPostAction(dist_doc_tar_gz, Chmod(dist_doc_tar_gz, 0644))
+    AddPostAction(dist_doc_tar_gz, Chmod(dist_doc_tar_gz, 0o644))
     Local(t)
     Alias('doc', t)
 else: