#4550: fix 2.x syntax in webservers howto.

6d204bf9 · Georg Brandl · 50b2b6ee · 6d204bf9
Commit 6d204bf9 authored Dec 05, 2008 by Georg Brandl
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 7 deletions

Doc/howto/webservers.rst Doc/howto/webservers.rst +8 -7

No files found.
--- a/Doc/howto/webservers.rst
+++ b/Doc/howto/webservers.rst
@@ -101,10 +101,10 @@ simple CGI program::
    # enable debugging
    import cgitb; cgitb.enable()

-    print "Content-Type: text/plain;charset=utf-8"
-    print
+    print("Content-Type: text/plain;charset=utf-8")
+    print()

-    print "Hello World!"
+    print("Hello World!")

 You need to write this code into a file with a ``.py`` or ``.cgi`` extension,
 this depends on your web server configuration.  Depending on your web server
@@ -278,8 +278,8 @@ following WSGI-application::
    #!/usr/bin/env python
    # -*- coding: UTF-8 -*-

-    from cgi import escape
    import sys, os
+    from cgi import escape
    from flup.server.fcgi import WSGIServer

    def app(environ, start_response):
@@ -288,7 +288,8 @@ following WSGI-application::
        yield '<h1>FastCGI Environment</h1>'
        yield '<table>'
        for k, v in sorted(environ.items()):
-             yield '<tr><th>%s</th><td>%s</td></tr>' % (escape(k), escape(v))
+             yield '<tr><th>{0}</th><td>{1}</td></tr>'.format(
+                 escape(k), escape(v))
        yield '</table>'

    WSGIServer(app).run()
@@ -476,8 +477,8 @@ placeholders.
 Python already includes such simple templates::

    # a simple template
-    template = "<html><body><h1>Hello %s!</h1></body></html>"
-    print template % "Reader"
+    template = "<html><body><h1>Hello {who}!</h1></body></html>"
+    print(template.format(who="Reader"))

 The Python standard library also includes some more advanced templates usable
 through :class:`string.Template`, but in HTML templates it is needed to use