Merge branch 'master' of github.com:Pylons/pyramid

7 files changed, 13 insertions, 14 deletions

diff --git a/docs/narr/commandline.rst b/docs/narr/commandline.rst
index 17e5227fa..58b9bdd21 100644
--- a/docs/narr/commandline.rst
+++ b/docs/narr/commandline.rst
@@ -538,7 +538,7 @@ representing Pyramid your application configuration as a single argument:
 
    from pyramid.paster import bootstrap
    env = bootstrap('/path/to/my/development.ini')
-   print env['request'].route_url('home')
+   print(env['request'].route_url('home'))
 
 :func:`pyramid.paster.bootstrap` returns a dictionary containing
 framework-related information.  This dictionary will always contain a
@@ -606,7 +606,7 @@ to load instead of ``main``:
 
    from pyramid.paster import bootstrap
    env = bootstrap('/path/to/my/development.ini#another')
-   print env['request'].route_url('home')
+   print(env['request'].route_url('home'))
 
 The above example specifies the ``another`` ``app``, ``pipeline``, or
 ``composite`` section of your PasteDeploy configuration file. The ``app``
@@ -643,7 +643,7 @@ the desired request and passing it into :func:`~pyramid.paster.bootstrap`:
 
    request = Request.blank('/', base_url='https://example.com/prefix')
    env = bootstrap('/path/to/my/development.ini#another', request=request)
-   print env['request'].application_url
+   print(env['request'].application_url)
    # will print 'https://example.com/prefix'
 
 Now you can readily use Pyramid's APIs for generating URLs:
diff --git a/docs/narr/events.rst b/docs/narr/events.rst
index 11af89ca6..2accb3dbe 100644
--- a/docs/narr/events.rst
+++ b/docs/narr/events.rst
@@ -26,7 +26,7 @@ subscriber is a function that accepts a single argument named `event`:
    :linenos:
 
    def mysubscriber(event):
-       print event
+       print(event)
 
 The above is a subscriber that simply prints the event to the console
 when it's called.
@@ -113,10 +113,10 @@ your application like so:
    :linenos:
 
    def handle_new_request(event):
-       print 'request', event.request
+       print('request', event.request)
 
    def handle_new_response(event):
-       print 'response', event.response
+       print('response', event.response)
 
 You may configure these functions to be called at the appropriate
 times by adding the following code to your application's
diff --git a/docs/narr/extconfig.rst b/docs/narr/extconfig.rst
index 659056952..6587aef92 100644
--- a/docs/narr/extconfig.rst
+++ b/docs/narr/extconfig.rst
@@ -55,7 +55,7 @@ method of the Configurator:
    :linenos:
 
    def mysubscriber(event):
-       print event.request
+       print(event.request)
 
    config.add_newrequest_subscriber(mysubscriber)
 
@@ -79,7 +79,7 @@ able to install it and subsequently do:
    :linenos:
 
    def mysubscriber(event):
-       print event.request
+       print(event.request)
 
    from pyramid.config import Configurator
    config = Configurator()
diff --git a/docs/narr/hooks.rst b/docs/narr/hooks.rst
index 37a74b53a..3a2568775 100644
--- a/docs/narr/hooks.rst
+++ b/docs/narr/hooks.rst
@@ -291,7 +291,7 @@ actually execute the function until accessed.
        return sum(args)
 
    def prop(request):
-       print "getting the property"
+       print("getting the property")
        return "the property"
 
    config = Configurator()
@@ -332,7 +332,7 @@ Here is an example of passing a class to ``Configurator.add_request_method``:
        # use @property if you don't want to cache the result
        @reify
        def prop(self):
-           print "getting the property"
+           print("getting the property")
            return "the property"
 
    config = Configurator()
diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index d05c8abeb..ef5772f79 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -336,6 +336,7 @@ You can use Pyramid on Windows under Python 2 or under Python 3.
 #. Install `virtualenv`:
 
    .. code-block:: text
+
       # modify the command according to the python version, e.g.:
       # for Python 2.7:
       c:\> c:\Python27\Scripts\easy_install virtualenv
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index ec5d706aa..52f13d5a8 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -49,9 +49,7 @@ The included scaffolds are these:
   URL mapping via :term:`URL dispatch` and no persistence mechanism.
 
 ``zodb``
-  URL mapping via :term:`traversal` and persistence via :term:`ZODB`.  *Note
-  that, as of this writing, this scaffold will not run under Python 3, only
-  under Python 2.*
+  URL mapping via :term:`traversal` and persistence via :term:`ZODB`.
 
 ``alchemy``
   URL mapping via :term:`URL dispatch` and persistence via
diff --git a/docs/narr/webob.rst b/docs/narr/webob.rst
index c0ca450b1..f0a4b5a0b 100644
--- a/docs/narr/webob.rst
+++ b/docs/narr/webob.rst
@@ -287,7 +287,7 @@ When such a request reaches a view in your application, the
 
     @view_config(renderer='string')
     def aview(request):
-        print request.json_body
+        print(request.json_body)
         return 'OK'
 
 For the above view, printed to the console will be: