[Python-3000-checkins] r57758 - in python/branches/py3k: Doc/includes/minidom-example.py Doc/tools/sphinx-build.py PC/testpy.py

Thu Aug 30 20:50:25 CEST 2007

Author: collin.winter
Date: Thu Aug 30 20:50:25 2007
New Revision: 57758

Modified:
   python/branches/py3k/Doc/includes/minidom-example.py
   python/branches/py3k/Doc/tools/sphinx-build.py
   python/branches/py3k/PC/testpy.py
Log:
Fix more lingering print statements.

Modified: python/branches/py3k/Doc/includes/minidom-example.py
==============================================================================

--- python/branches/py3k/Doc/includes/minidom-example.py	(original)
+++ python/branches/py3k/Doc/includes/minidom-example.py	Thu Aug 30 20:50:25 2007
@@ -26,12 +26,12 @@
     return rc
 
 def handleSlideshow(slideshow):
-    print "<html>"
+    print("<html>")
     handleSlideshowTitle(slideshow.getElementsByTagName("title")[0])
     slides = slideshow.getElementsByTagName("slide")
     handleToc(slides)
     handleSlides(slides)
-    print "</html>"
+    print("</html>")
 
 def handleSlides(slides):
     for slide in slides:
@@ -42,23 +42,23 @@
     handlePoints(slide.getElementsByTagName("point"))
 
 def handleSlideshowTitle(title):
-    print "<title>%s</title>" % getText(title.childNodes)
+    print("<title>%s</title>" % getText(title.childNodes))
 
 def handleSlideTitle(title):
-    print "<h2>%s</h2>" % getText(title.childNodes)
+    print("<h2>%s</h2>" % getText(title.childNodes))
 
 def handlePoints(points):
-    print "<ul>"
+    print("<ul>")
     for point in points:
         handlePoint(point)
-    print "</ul>"
+    print("</ul>")
 
 def handlePoint(point):
-    print "<li>%s</li>" % getText(point.childNodes)
+    print("<li>%s</li>" % getText(point.childNodes))
 
 def handleToc(slides):
     for slide in slides:
         title = slide.getElementsByTagName("title")[0]
-        print "<p>%s</p>" % getText(title.childNodes)
+        print("<p>%s</p>" % getText(title.childNodes))
 
 handleSlideshow(dom)

Modified: python/branches/py3k/Doc/tools/sphinx-build.py
==============================================================================
--- python/branches/py3k/Doc/tools/sphinx-build.py	(original)
+++ python/branches/py3k/Doc/tools/sphinx-build.py	Thu Aug 30 20:50:25 2007
@@ -12,12 +12,12 @@
 if __name__ == '__main__':
 
     if sys.version_info[:3] < (2, 5, 1):
-        print >>sys.stderr, """\
+        print("""\
 Error: Sphinx needs to be executed with Python 2.5.1 or newer
 (If you run this from the Makefile, you can set the PYTHON variable
 to the path of an alternative interpreter executable, e.g.,
 ``make html PYTHON=python2.5``).
-"""
+""", file=sys.stderr)
         sys.exit(1)
 
     from sphinx import main

Modified: python/branches/py3k/PC/testpy.py
==============================================================================
--- python/branches/py3k/PC/testpy.py	(original)
+++ python/branches/py3k/PC/testpy.py	Thu Aug 30 20:50:25 2007
@@ -7,15 +7,15 @@
 try:
     import os
 except:
-    print """Could not import the standard "os" module.
-  Please check your PYTHONPATH environment variable."""
+    print("""Could not import the standard "os" module.
+  Please check your PYTHONPATH environment variable.""")
     sys.exit(1)
 
 try:
     import symbol
 except:
-    print """Could not import the standard "symbol" module.  If this is
-  a PC, you should add the dos_8x3 directory to your PYTHONPATH."""
+    print("""Could not import the standard "symbol" module.  If this is
+  a PC, you should add the dos_8x3 directory to your PYTHONPATH.""")
     sys.exit(1)
 
 import os
