diff options
| author | Chris McDonough <chrism@plope.com> | 2011-10-24 12:55:58 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-10-24 12:55:58 -0400 |
| commit | 517c757fbbfb0103eea3000db109f946c6015c80 (patch) | |
| tree | 050208a57477a663a47860899041ba5d48571944 | |
| parent | b75e577383936454d8b3e912f4f5478bf9af01e6 (diff) | |
| parent | d7690e7cd23d2f37f9f934730209fcdf0c89bb94 (diff) | |
| download | pyramid-517c757fbbfb0103eea3000db109f946c6015c80.tar.gz pyramid-517c757fbbfb0103eea3000db109f946c6015c80.tar.bz2 pyramid-517c757fbbfb0103eea3000db109f946c6015c80.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
| -rw-r--r-- | docs/narr/i18n.rst | 2 | ||||
| -rw-r--r-- | docs/narr/muchadoabouttraversal.rst | 4 | ||||
| -rw-r--r-- | docs/narr/urldispatch.rst | 2 | ||||
| -rw-r--r-- | pyramid/config/views.py | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/docs/narr/i18n.rst b/docs/narr/i18n.rst index 631654d32..c5e6a9062 100644 --- a/docs/narr/i18n.rst +++ b/docs/narr/i18n.rst @@ -249,7 +249,7 @@ GNU gettext uses three types of files in the translation framework, The tools for working with :term:`gettext` translation files related to a :app:`Pyramid` application is :term:`Babel` and :term:`Lingua`. Lingua is a -Balel extension that provides support for scraping i18n references out of +Babel extension that provides support for scraping i18n references out of Python and Chameleon files. .. index:: diff --git a/docs/narr/muchadoabouttraversal.rst b/docs/narr/muchadoabouttraversal.rst index a948e57cc..4a249ed0d 100644 --- a/docs/narr/muchadoabouttraversal.rst +++ b/docs/narr/muchadoabouttraversal.rst @@ -4,7 +4,9 @@ Much Ado About Traversal ======================== -.. note:: This chapter was adapted, with permission, from a blog post by `Rob +.. note:: + + This chapter was adapted, with permission, from a blog post by `Rob Miller <http://blog.nonsequitarian.org/>`_, originally published at http://blog.nonsequitarian.org/2010/much-ado-about-traversal/ . diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst index c2414965c..35613ea1b 100644 --- a/docs/narr/urldispatch.rst +++ b/docs/narr/urldispatch.rst @@ -101,7 +101,7 @@ that references ``myroute`` as a ``route_name`` parameter: def myview(request): return Response('OK') -THe above combination of ``add_route`` and ``scan`` is completely equivalent +The above combination of ``add_route`` and ``scan`` is completely equivalent to using the previous combination of ``add_route`` and ``add_view``. .. index:: diff --git a/pyramid/config/views.py b/pyramid/config/views.py index 179d4065c..9b277dafb 100644 --- a/pyramid/config/views.py +++ b/pyramid/config/views.py @@ -481,7 +481,7 @@ class MultiView(object): if accept is None or '*' in accept: self.views.append((order, view, phash)) - self.views.sort() + self.views.sort(key=lambda x: x[0]) else: subset = self.media_views.setdefault(accept, []) subset.append((order, view, phash)) |