Merge branch 'ww/415' of https://github.com/wwitzel3/pyramid into wwitzel3-ww/415

4 files changed, 7 insertions, 7 deletions

diff --git a/docs/designdefense.rst b/docs/designdefense.rst
index 59b0e5a2d..84b6be907 100644
--- a/docs/designdefense.rst
+++ b/docs/designdefense.rst
@@ -219,7 +219,7 @@ is this:
 Using such wrappers, we strive to always hide the ZCA API from application
 developers.  Application developers should just never know about the ZCA API:
 they should call a Python function with some object germane to the domain as
-an argument, and it should returns a result.  A corollary that follows is
+an argument, and it should return a result.  A corollary that follows is
 that any reader of an application that has been written using :app:`Pyramid`
 needn't understand the ZCA API either.
 
@@ -720,7 +720,7 @@ microframeworks and Django boast.
 The :mod:`zope.component`, package on which :app:`Pyramid` depends has
 transitive dependencies on several other packages (:mod:`zope.event`, and
 :mod:`zope.interface`).  :app:`Pyramid` also has its own direct dependencies,
-such as :term:`PasteDeploy`, :term:`Chameleon`, :term:`Mako` :term:`WebOb`,
+such as :term:`PasteDeploy`, :term:`Chameleon`, :term:`Mako`, :term:`WebOb`,
 :mod:`zope.deprecation` and some of these in turn have their own transitive
 dependencies.
 
diff --git a/docs/narr/views.rst b/docs/narr/views.rst
index fa34cca61..dbc702de8 100644
--- a/docs/narr/views.rst
+++ b/docs/narr/views.rst
@@ -30,7 +30,7 @@ View Callables
 
 View callables are, at the risk of sounding obvious, callable Python
 objects. Specifically, view callables can be functions, classes, or instances
-that implement an ``__call__`` method (making the instance callable).
+that implement a ``__call__`` method (making the instance callable).
 
 View callables must, at a minimum, accept a single argument named
 ``request``.  This argument represents a :app:`Pyramid` :term:`Request`
diff --git a/pyramid/config/util.py b/pyramid/config/util.py
index b39fb8ee0..6b7aa2fa1 100644
--- a/pyramid/config/util.py
+++ b/pyramid/config/util.py
@@ -44,7 +44,7 @@ def action_method(wrapped):
             self._ainfo = []
         info = kw.pop('_info', None)
         # backframes for outer decorators to actionmethods
-        backframes = kw.pop('_backframes', 2) 
+        backframes = kw.pop('_backframes', 2)
         if is_nonstr_iter(info) and len(info) == 4:
             # _info permitted as extract_stack tuple
             info = ActionInfo(*info)
@@ -132,7 +132,7 @@ def make_predicates(xhr=None, request_method=None, path_info=None,
         request_method = sorted(request_method)
         def request_method_predicate(context, request):
             return request.method in request_method
-        text = "request method = %s" % repr(request_method)
+        text = "request method = %r" % request_method
         request_method_predicate.__text__ = text
         weights.append(1 << 2)
         predicates.append(request_method_predicate)
diff --git a/pyramid/config/views.py b/pyramid/config/views.py
index a87ab54c7..86b139e3e 100644
--- a/pyramid/config/views.py
+++ b/pyramid/config/views.py
@@ -344,8 +344,8 @@ class ViewDeriver(object):
             response = registry.queryAdapterOrSelf(result, IResponse)
             if response is None:
                 raise ValueError(
-                    'Could not convert view return value "%s" into a '
-                    'response object' % (result,))
+                    'Could not convert %r return value "%s" into a '
+                    'response object' % (view,result,))
             return response
 
         return viewresult_to_response