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

2 files changed, 3 insertions, 3 deletions

diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index 92955aafd..507201439 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -260,11 +260,11 @@ Here's a few views defined as methods of a class instead:
            self.request = request
 
        @view_config(route_name='view_one')
-       def view_one(request):
+       def view_one(self, request):
            return Response('one')
 
        @view_config(route_name='view_two')
-       def view_two(request):
+       def view_two(self, request):
            return Response('two')
 
 See also :ref:`view_config_placement`.
diff --git a/pyramid/testing.py b/pyramid/testing.py
index 025730ac5..d32a7fe0b 100644
--- a/pyramid/testing.py
+++ b/pyramid/testing.py
@@ -515,7 +515,7 @@ class DummyTemplateRenderer(object):
             if myval != v:
                 raise AssertionError(
                     '\nasserted value for %s: %r\nactual value: %r' % (
-                    v, k, myval))
+                    k, v, myval))
         return True
 
 class DummyResource: