From 39eb94dc5c1d1e254db682476dd3e5e7d2abfc86 Mon Sep 17 00:00:00 2001 From: Marius Gedminas Date: Wed, 12 Jan 2011 22:40:12 +0200 Subject: Typo: neednt -> needn't. --- pyramid/interfaces.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyramid/interfaces.py b/pyramid/interfaces.py index 14ff100b1..a9b686105 100644 --- a/pyramid/interfaces.py +++ b/pyramid/interfaces.py @@ -165,7 +165,7 @@ class IAuthenticationPolicy(Interface): def unauthenticated_userid(request): """ Return the *unauthenticated* userid. This method performs the same duty as ``authenticated_userid`` but is permitted to return the - userid based only on data present in the request; it neednt (and + userid based only on data present in the request; it needn't (and shouldn't) check any persistent store to ensure that the user record related to the request userid exists.""" -- cgit v1.2.3 From e7b5fe05297d46cc169bd2f255529952569d899c Mon Sep 17 00:00:00 2001 From: Blaise Laflamme Date: Wed, 12 Jan 2011 23:07:54 -0500 Subject: Changed some references from pylonshq.com to pylonsproject.org --- README.rst | 4 ++-- docs/conventions.rst | 2 +- docs/copyright.rst | 2 +- docs/designdefense.rst | 2 +- docs/index.rst | 6 +++--- docs/narr/MyProject/myproject/templates/mytemplate.pt | 16 ++++++++-------- docs/narr/introduction.rst | 2 +- docs/narr/templates.rst | 4 ++-- .../src/authorization/tutorial/templates/mytemplate.pt | 16 ++++++++-------- .../src/basiclayout/tutorial/templates/mytemplate.pt | 16 ++++++++-------- .../wiki/src/models/tutorial/templates/mytemplate.pt | 16 ++++++++-------- .../wiki/src/views/tutorial/templates/mytemplate.pt | 16 ++++++++-------- .../src/authorization/tutorial/templates/mytemplate.pt | 16 ++++++++-------- .../src/basiclayout/tutorial/templates/mytemplate.pt | 16 ++++++++-------- .../wiki2/src/models/tutorial/templates/mytemplate.pt | 16 ++++++++-------- .../wiki2/src/views/tutorial/templates/mytemplate.pt | 16 ++++++++-------- .../alchemy/+package+/templates/model.pt_tmpl | 16 ++++++++-------- .../alchemy/+package+/templates/root.pt_tmpl | 16 ++++++++-------- .../+package+/templates/mytemplate.mako_tmpl | 16 ++++++++-------- .../+package+/templates/mytemplate.mako_tmpl | 16 ++++++++-------- .../pylons_sqla/+package+/templates/mytemplate.mako_tmpl | 16 ++++++++-------- .../routesalchemy/+package+/templates/mytemplate.pt_tmpl | 16 ++++++++-------- .../starter/+package+/templates/mytemplate.pt_tmpl | 16 ++++++++-------- .../starter_zcml/+package+/templates/mytemplate.pt_tmpl | 16 ++++++++-------- .../zodb/+package+/templates/mytemplate.pt_tmpl | 16 ++++++++-------- setup.py | 2 +- 26 files changed, 156 insertions(+), 156 deletions(-) diff --git a/README.rst b/README.rst index 220dcbe73..acacd2422 100644 --- a/README.rst +++ b/README.rst @@ -5,7 +5,7 @@ Pyramid is a small, fast, down-to-earth, open source Python web development framework. It makes real-world web application development and deployment more fun, more predictable, and more productive. -Pyramid is a `Pylons `_ project, and underlies the +Pyramid is a `Pylons `_ project, and underlies the newest web frameworks produced by the Pylons community. Pyramid was previously known as `repoze.bfg `_. @@ -13,7 +13,7 @@ Pyramid was previously known as `repoze.bfg `_. Support and Documentation ------------------------- -See the `Pylons Project website `_ to view +See the `Pylons Project website `_ to view documentation, report bugs, and obtain support. License diff --git a/docs/conventions.rst b/docs/conventions.rst index 71c40e104..9e8510e4d 100644 --- a/docs/conventions.rst +++ b/docs/conventions.rst @@ -35,7 +35,7 @@ References to glossary terms are presented using the following style: URLs are presented using the following style: - `Pylons `_ + `Pylons `_ References to sections and chapters are presented using the following style: diff --git a/docs/copyright.rst b/docs/copyright.rst index 9ef093d0c..aa4efc6cb 100644 --- a/docs/copyright.rst +++ b/docs/copyright.rst @@ -88,7 +88,7 @@ HTML Version and Source Code ---------------------------- An HTML version of this book is freely available via -http://docs.pylonshq.com +http://docs.pylonsproject.org The source code for the examples used in this book are available within the :app:`Pyramid` software distribution, always available diff --git a/docs/designdefense.rst b/docs/designdefense.rst index e9dbc72c0..594d42b9e 100644 --- a/docs/designdefense.rst +++ b/docs/designdefense.rst @@ -1472,7 +1472,7 @@ global*: # this is executed if the request method was GET or the # credentials were invalid -The `Pylons 1.X `_ web framework uses a similar +The `Pylons 1.X `_ web framework uses a similar strategy. It calls these things "Stacked Object Proxies", so, for purposes of this discussion, I'll do so as well. diff --git a/docs/index.rst b/docs/index.rst index 7b1c46b70..0dc476e46 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -6,7 +6,7 @@ The Pyramid Web Application Development Framework :app:`Pyramid` is a small, fast, down-to-earth Python web application development framework. It is developed as part of the `Pylons Project -`_. It is licensed under a `BSD-like license +`_. It is licensed under a `BSD-like license `_. .. note:: @@ -175,7 +175,7 @@ commenting, and file uploads. See the `KARL site Support and Development ======================= -The `Pylons Project web site `_ is the main online +The `Pylons Project web site `_ is the main online source of :app:`Pyramid` support and development information. To report bugs, use the `issue tracker @@ -196,7 +196,7 @@ To check out the trunk via ``git``, use this command: To find out how to become a contributor to :app:`Pyramid`, please see the `contributor's section of the documentation -`_. +`_. Index and Glossary ================== diff --git a/docs/narr/MyProject/myproject/templates/mytemplate.pt b/docs/narr/MyProject/myproject/templates/mytemplate.pt index 02fc00eeb..ec22ef396 100644 --- a/docs/narr/MyProject/myproject/templates/mytemplate.pt +++ b/docs/narr/MyProject/myproject/templates/mytemplate.pt @@ -32,7 +32,7 @@

Search documentation

-
+
@@ -41,25 +41,25 @@

Pyramid links

  • - Pylons Website + Pylons Website
  • - Narrative Documentation + Narrative Documentation
  • - API Documentation + API Documentation
  • - Tutorials + Tutorials
  • - Change History + Change History
  • - Sample Applications + Sample Applications
  • - Support and Development + Support and Development
  • IRC Channel diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst index c61ef21d4..2da75df39 100644 --- a/docs/narr/introduction.rst +++ b/docs/narr/introduction.rst @@ -104,7 +104,7 @@ What Is The Pylons Project? :app:`Pyramid` is a member of the collection of software published under the Pylons Project. Pylons software is written by a loose-knit community of -contributors. The `Pylons Project website `_ +contributors. The `Pylons Project website `_ includes details about how :app:`Pyramid` relates to the Pylons Project. .. index:: diff --git a/docs/narr/templates.rst b/docs/narr/templates.rst index 7ef8e1923..b97cc7be6 100644 --- a/docs/narr/templates.rst +++ b/docs/narr/templates.rst @@ -448,7 +448,7 @@ Here's what a simple :term:`Chameleon` ZPT template used under

    Welcome to ${project}, an application generated by the pyramid web + href="http://docs.pylonsproject.org/projects/pyramid/dev/">pyramid web application framework.

    @@ -744,7 +744,7 @@ look like:

    Welcome to ${project}, an application generated by the pyramid web + href="http://docs.pylonsproject.org/projects/pyramid/dev/">pyramid web application framework.

    diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt index cac9ccaa7..4bd01e73e 100644 --- a/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt +++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt @@ -32,7 +32,7 @@

    Search documentation

    -
    +
    @@ -41,25 +41,25 @@

    Pyramid links

    • - Pylons Website + Pylons Website
    • - Narrative Documentation + Narrative Documentation
    • - API Documentation + API Documentation
    • - Tutorials + Tutorials
    • - Change History + Change History
    • - Sample Applications + Sample Applications
    • - Support and Development + Support and Development
    • IRC Channel diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt index cac9ccaa7..98f178b31 100644 --- a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt +++ b/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt @@ -32,7 +32,7 @@

      Search documentation

      -
      +
      @@ -41,25 +41,25 @@

      Pyramid links

      • - Pylons Website + Pylons Website
      • - Narrative Documentation + Narrative Documentation
      • - API Documentation + API Documentation
      • - Tutorials + Tutorials
      • - Change History + Change History
      • - Sample Applications + Sample Applications
      • - Support and Development + Support and Development
      • IRC Channel diff --git a/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt index cac9ccaa7..4bd01e73e 100644 --- a/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt +++ b/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt @@ -32,7 +32,7 @@

        Search documentation

        -
        +
        @@ -41,25 +41,25 @@

        Pyramid links

        • - Pylons Website + Pylons Website
        • - Narrative Documentation + Narrative Documentation
        • - API Documentation + API Documentation
        • - Tutorials + Tutorials
        • - Change History + Change History
        • - Sample Applications + Sample Applications
        • - Support and Development + Support and Development
        • IRC Channel diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt index cac9ccaa7..4bd01e73e 100644 --- a/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt +++ b/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt @@ -32,7 +32,7 @@

          Search documentation

          -
          +
          @@ -41,25 +41,25 @@

          Pyramid links

          • - Pylons Website + Pylons Website
          • - Narrative Documentation + Narrative Documentation
          • - API Documentation + API Documentation
          • - Tutorials + Tutorials
          • - Change History + Change History
          • - Sample Applications + Sample Applications
          • - Support and Development + Support and Development
          • IRC Channel diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki2/src/authorization/tutorial/templates/mytemplate.pt index cac9ccaa7..4bd01e73e 100644 --- a/docs/tutorials/wiki2/src/authorization/tutorial/templates/mytemplate.pt +++ b/docs/tutorials/wiki2/src/authorization/tutorial/templates/mytemplate.pt @@ -32,7 +32,7 @@

            Search documentation

            -
            +
            @@ -41,25 +41,25 @@

            Pyramid links

            • - Pylons Website + Pylons Website
            • - Narrative Documentation + Narrative Documentation
            • - API Documentation + API Documentation
            • - Tutorials + Tutorials
            • - Change History + Change History
            • - Sample Applications + Sample Applications
            • - Support and Development + Support and Development
            • IRC Channel diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt index cac9ccaa7..4bd01e73e 100644 --- a/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt +++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt @@ -32,7 +32,7 @@

              Search documentation

              -
              +
              @@ -41,25 +41,25 @@

              Pyramid links

              • - Pylons Website + Pylons Website
              • - Narrative Documentation + Narrative Documentation
              • - API Documentation + API Documentation
              • - Tutorials + Tutorials
              • - Change History + Change History
              • - Sample Applications + Sample Applications
              • - Support and Development + Support and Development
              • IRC Channel diff --git a/docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.pt index cac9ccaa7..4bd01e73e 100644 --- a/docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.pt +++ b/docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.pt @@ -32,7 +32,7 @@

                Search documentation

                -
                +
                @@ -41,25 +41,25 @@

                Pyramid links

                • - Pylons Website + Pylons Website
                • - Narrative Documentation + Narrative Documentation
                • - API Documentation + API Documentation
                • - Tutorials + Tutorials
                • - Change History + Change History
                • - Sample Applications + Sample Applications
                • - Support and Development + Support and Development
                • IRC Channel diff --git a/docs/tutorials/wiki2/src/views/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki2/src/views/tutorial/templates/mytemplate.pt index cac9ccaa7..4bd01e73e 100644 --- a/docs/tutorials/wiki2/src/views/tutorial/templates/mytemplate.pt +++ b/docs/tutorials/wiki2/src/views/tutorial/templates/mytemplate.pt @@ -32,7 +32,7 @@

                  Search documentation

                  -
                  +
                  @@ -41,25 +41,25 @@

                  Pyramid links

                  • - Pylons Website + Pylons Website
                  • - Narrative Documentation + Narrative Documentation
                  • - API Documentation + API Documentation
                  • - Tutorials + Tutorials
                  • - Change History + Change History
                  • - Sample Applications + Sample Applications
                  • - Support and Development + Support and Development
                  • IRC Channel diff --git a/pyramid/paster_templates/alchemy/+package+/templates/model.pt_tmpl b/pyramid/paster_templates/alchemy/+package+/templates/model.pt_tmpl index 1fd3c0b20..9cffd9dba 100644 --- a/pyramid/paster_templates/alchemy/+package+/templates/model.pt_tmpl +++ b/pyramid/paster_templates/alchemy/+package+/templates/model.pt_tmpl @@ -32,7 +32,7 @@

                    Search documentation

                    -
                    +
                    @@ -47,25 +47,25 @@

                    Pyramid links

                    • - Pylons Website + Pylons Website
                    • - Narrative Documentation + Narrative Documentation
                    • - API Documentation + API Documentation
                    • - Tutorials + Tutorials
                    • - Change History + Change History
                    • - Sample Applications + Sample Applications
                    • - Support and Development + Support and Development
                    • IRC Channel diff --git a/pyramid/paster_templates/alchemy/+package+/templates/root.pt_tmpl b/pyramid/paster_templates/alchemy/+package+/templates/root.pt_tmpl index ca05896ae..8ed0c1457 100644 --- a/pyramid/paster_templates/alchemy/+package+/templates/root.pt_tmpl +++ b/pyramid/paster_templates/alchemy/+package+/templates/root.pt_tmpl @@ -32,7 +32,7 @@

                      Search documentation

                      -
                      +
                      @@ -45,25 +45,25 @@

                      Pyramid links

                      • - Pylons Website + Pylons Website
                      • - Narrative Documentation + Narrative Documentation
                      • - API Documentation + API Documentation
                      • - Tutorials + Tutorials
                      • - Change History + Change History
                      • - Sample Applications + Sample Applications
                      • - Support and Development + Support and Development
                      • IRC Channel diff --git a/pyramid/paster_templates/pylons_basic/+package+/templates/mytemplate.mako_tmpl b/pyramid/paster_templates/pylons_basic/+package+/templates/mytemplate.mako_tmpl index a658ee2c9..9f36d99e7 100644 --- a/pyramid/paster_templates/pylons_basic/+package+/templates/mytemplate.mako_tmpl +++ b/pyramid/paster_templates/pylons_basic/+package+/templates/mytemplate.mako_tmpl @@ -32,7 +32,7 @@

                        Search documentation

                        -
                        +
                        @@ -41,25 +41,25 @@

                        Pyramid links

                        • - Pylons Website + Pylons Website
                        • - Narrative Documentation + Narrative Documentation
                        • - API Documentation + API Documentation
                        • - Tutorials + Tutorials
                        • - Change History + Change History
                        • - Sample Applications + Sample Applications
                        • - Support and Development + Support and Development
                        • IRC Channel diff --git a/pyramid/paster_templates/pylons_minimal/+package+/templates/mytemplate.mako_tmpl b/pyramid/paster_templates/pylons_minimal/+package+/templates/mytemplate.mako_tmpl index a658ee2c9..9f36d99e7 100644 --- a/pyramid/paster_templates/pylons_minimal/+package+/templates/mytemplate.mako_tmpl +++ b/pyramid/paster_templates/pylons_minimal/+package+/templates/mytemplate.mako_tmpl @@ -32,7 +32,7 @@

                          Search documentation

                          -
                          +
                          @@ -41,25 +41,25 @@

                          Pyramid links

                          • - Pylons Website + Pylons Website
                          • - Narrative Documentation + Narrative Documentation
                          • - API Documentation + API Documentation
                          • - Tutorials + Tutorials
                          • - Change History + Change History
                          • - Sample Applications + Sample Applications
                          • - Support and Development + Support and Development
                          • IRC Channel diff --git a/pyramid/paster_templates/pylons_sqla/+package+/templates/mytemplate.mako_tmpl b/pyramid/paster_templates/pylons_sqla/+package+/templates/mytemplate.mako_tmpl index 9130f6da8..261dbdff4 100644 --- a/pyramid/paster_templates/pylons_sqla/+package+/templates/mytemplate.mako_tmpl +++ b/pyramid/paster_templates/pylons_sqla/+package+/templates/mytemplate.mako_tmpl @@ -32,7 +32,7 @@

                            Search documentation

                            -
                            +
                            @@ -43,25 +43,25 @@

                            Pyramid links

                            • - Pylons Website + Pylons Website
                            • - Narrative Documentation + Narrative Documentation
                            • - API Documentation + API Documentation
                            • - Tutorials + Tutorials
                            • - Change History + Change History
                            • - Sample Applications + Sample Applications
                            • - Support and Development + Support and Development
                            • IRC Channel diff --git a/pyramid/paster_templates/routesalchemy/+package+/templates/mytemplate.pt_tmpl b/pyramid/paster_templates/routesalchemy/+package+/templates/mytemplate.pt_tmpl index a658ee2c9..9f36d99e7 100644 --- a/pyramid/paster_templates/routesalchemy/+package+/templates/mytemplate.pt_tmpl +++ b/pyramid/paster_templates/routesalchemy/+package+/templates/mytemplate.pt_tmpl @@ -32,7 +32,7 @@

                              Search documentation

                              -
                              +
                              @@ -41,25 +41,25 @@

                              Pyramid links

                              • - Pylons Website + Pylons Website
                              • - Narrative Documentation + Narrative Documentation
                              • - API Documentation + API Documentation
                              • - Tutorials + Tutorials
                              • - Change History + Change History
                              • - Sample Applications + Sample Applications
                              • - Support and Development + Support and Development
                              • IRC Channel diff --git a/pyramid/paster_templates/starter/+package+/templates/mytemplate.pt_tmpl b/pyramid/paster_templates/starter/+package+/templates/mytemplate.pt_tmpl index a658ee2c9..9f36d99e7 100644 --- a/pyramid/paster_templates/starter/+package+/templates/mytemplate.pt_tmpl +++ b/pyramid/paster_templates/starter/+package+/templates/mytemplate.pt_tmpl @@ -32,7 +32,7 @@

                                Search documentation

                                -
                                +
                                @@ -41,25 +41,25 @@

                                Pyramid links

                                • - Pylons Website + Pylons Website
                                • - Narrative Documentation + Narrative Documentation
                                • - API Documentation + API Documentation
                                • - Tutorials + Tutorials
                                • - Change History + Change History
                                • - Sample Applications + Sample Applications
                                • - Support and Development + Support and Development
                                • IRC Channel diff --git a/pyramid/paster_templates/starter_zcml/+package+/templates/mytemplate.pt_tmpl b/pyramid/paster_templates/starter_zcml/+package+/templates/mytemplate.pt_tmpl index a658ee2c9..9f36d99e7 100644 --- a/pyramid/paster_templates/starter_zcml/+package+/templates/mytemplate.pt_tmpl +++ b/pyramid/paster_templates/starter_zcml/+package+/templates/mytemplate.pt_tmpl @@ -32,7 +32,7 @@

                                  Search documentation

                                  -
                                  +
                                  @@ -41,25 +41,25 @@

                                  Pyramid links

                                  • - Pylons Website + Pylons Website
                                  • - Narrative Documentation + Narrative Documentation
                                  • - API Documentation + API Documentation
                                  • - Tutorials + Tutorials
                                  • - Change History + Change History
                                  • - Sample Applications + Sample Applications
                                  • - Support and Development + Support and Development
                                  • IRC Channel diff --git a/pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt_tmpl b/pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt_tmpl index a658ee2c9..9f36d99e7 100644 --- a/pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt_tmpl +++ b/pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt_tmpl @@ -32,7 +32,7 @@

                                    Search documentation

                                    -
                                    +
                                    @@ -41,25 +41,25 @@

                                    Pyramid links

                                    • - Pylons Website + Pylons Website
                                    • - Narrative Documentation + Narrative Documentation
                                    • - API Documentation + API Documentation
                                    • - Tutorials + Tutorials
                                    • - Change History + Change History
                                    • - Sample Applications + Sample Applications
                                    • - Support and Development + Support and Development
                                    • IRC Channel diff --git a/setup.py b/setup.py index d58641487..889aaecec 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ setup(name='pyramid', keywords='web wsgi pylons pyramid bfg', author="Chris McDonough, Agendaless Consulting", author_email="pylons-devel@googlegroups.com", - url="http://docs.pylonshq.com", + url="http://docs.pylonsproject.org", license="BSD-derived (http://www.repoze.org/LICENSE.txt)", packages=find_packages(), include_package_data=True, -- cgit v1.2.3 From eb761d11ecd1ecfc2d8cc77b3dd98ad6fcf4a7ed Mon Sep 17 00:00:00 2001 From: Blaise Laflamme Date: Wed, 12 Jan 2011 23:15:28 -0500 Subject: Changed google font link in paster templates --- pyramid/paster_templates/alchemy/+package+/templates/model.pt_tmpl | 3 +-- pyramid/paster_templates/alchemy/+package+/templates/root.pt_tmpl | 3 +-- .../pylons_basic/+package+/templates/mytemplate.mako_tmpl | 3 +-- .../pylons_minimal/+package+/templates/mytemplate.mako_tmpl | 3 +-- .../pylons_sqla/+package+/templates/mytemplate.mako_tmpl | 3 +-- .../routesalchemy/+package+/templates/mytemplate.pt_tmpl | 3 +-- .../paster_templates/starter/+package+/templates/mytemplate.pt_tmpl | 3 +-- .../starter_zcml/+package+/templates/mytemplate.pt_tmpl | 3 +-- pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt_tmpl | 3 +-- 9 files changed, 9 insertions(+), 18 deletions(-) diff --git a/pyramid/paster_templates/alchemy/+package+/templates/model.pt_tmpl b/pyramid/paster_templates/alchemy/+package+/templates/model.pt_tmpl index 9cffd9dba..236424cae 100644 --- a/pyramid/paster_templates/alchemy/+package+/templates/model.pt_tmpl +++ b/pyramid/paster_templates/alchemy/+package+/templates/model.pt_tmpl @@ -7,8 +7,7 @@ - - + diff --git a/pyramid/paster_templates/alchemy/+package+/templates/root.pt_tmpl b/pyramid/paster_templates/alchemy/+package+/templates/root.pt_tmpl index 8ed0c1457..557183a51 100644 --- a/pyramid/paster_templates/alchemy/+package+/templates/root.pt_tmpl +++ b/pyramid/paster_templates/alchemy/+package+/templates/root.pt_tmpl @@ -7,8 +7,7 @@ - - + diff --git a/pyramid/paster_templates/pylons_basic/+package+/templates/mytemplate.mako_tmpl b/pyramid/paster_templates/pylons_basic/+package+/templates/mytemplate.mako_tmpl index 9f36d99e7..e3fa39f28 100644 --- a/pyramid/paster_templates/pylons_basic/+package+/templates/mytemplate.mako_tmpl +++ b/pyramid/paster_templates/pylons_basic/+package+/templates/mytemplate.mako_tmpl @@ -7,8 +7,7 @@ - - + diff --git a/pyramid/paster_templates/pylons_minimal/+package+/templates/mytemplate.mako_tmpl b/pyramid/paster_templates/pylons_minimal/+package+/templates/mytemplate.mako_tmpl index 9f36d99e7..e3fa39f28 100644 --- a/pyramid/paster_templates/pylons_minimal/+package+/templates/mytemplate.mako_tmpl +++ b/pyramid/paster_templates/pylons_minimal/+package+/templates/mytemplate.mako_tmpl @@ -7,8 +7,7 @@ - - + diff --git a/pyramid/paster_templates/pylons_sqla/+package+/templates/mytemplate.mako_tmpl b/pyramid/paster_templates/pylons_sqla/+package+/templates/mytemplate.mako_tmpl index 261dbdff4..d12066ac8 100644 --- a/pyramid/paster_templates/pylons_sqla/+package+/templates/mytemplate.mako_tmpl +++ b/pyramid/paster_templates/pylons_sqla/+package+/templates/mytemplate.mako_tmpl @@ -7,8 +7,7 @@ - - + diff --git a/pyramid/paster_templates/routesalchemy/+package+/templates/mytemplate.pt_tmpl b/pyramid/paster_templates/routesalchemy/+package+/templates/mytemplate.pt_tmpl index 9f36d99e7..e3fa39f28 100644 --- a/pyramid/paster_templates/routesalchemy/+package+/templates/mytemplate.pt_tmpl +++ b/pyramid/paster_templates/routesalchemy/+package+/templates/mytemplate.pt_tmpl @@ -7,8 +7,7 @@ - - + diff --git a/pyramid/paster_templates/starter/+package+/templates/mytemplate.pt_tmpl b/pyramid/paster_templates/starter/+package+/templates/mytemplate.pt_tmpl index 9f36d99e7..e3fa39f28 100644 --- a/pyramid/paster_templates/starter/+package+/templates/mytemplate.pt_tmpl +++ b/pyramid/paster_templates/starter/+package+/templates/mytemplate.pt_tmpl @@ -7,8 +7,7 @@ - - + diff --git a/pyramid/paster_templates/starter_zcml/+package+/templates/mytemplate.pt_tmpl b/pyramid/paster_templates/starter_zcml/+package+/templates/mytemplate.pt_tmpl index 9f36d99e7..e3fa39f28 100644 --- a/pyramid/paster_templates/starter_zcml/+package+/templates/mytemplate.pt_tmpl +++ b/pyramid/paster_templates/starter_zcml/+package+/templates/mytemplate.pt_tmpl @@ -7,8 +7,7 @@ - - + diff --git a/pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt_tmpl b/pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt_tmpl index 9f36d99e7..e3fa39f28 100644 --- a/pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt_tmpl +++ b/pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt_tmpl @@ -7,8 +7,7 @@ - - + -- cgit v1.2.3 From 1c174d94aa4007222ecc8c74a0bb2c6a73f3dcb8 Mon Sep 17 00:00:00 2001 From: Blaise Laflamme Date: Wed, 12 Jan 2011 23:22:09 -0500 Subject: Changed google font link in tutorials --- docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt | 3 +-- docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt | 3 +-- docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt | 3 +-- docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt | 3 +-- docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt | 3 +-- docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt | 3 +-- docs/tutorials/wiki/src/views/tutorial/templates/edit.pt | 3 +-- docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt | 3 +-- docs/tutorials/wiki/src/views/tutorial/templates/view.pt | 3 +-- docs/tutorials/wiki2/src/authorization/tutorial/templates/edit.pt | 3 +-- docs/tutorials/wiki2/src/authorization/tutorial/templates/login.pt | 3 +-- .../tutorials/wiki2/src/authorization/tutorial/templates/mytemplate.pt | 3 +-- docs/tutorials/wiki2/src/authorization/tutorial/templates/view.pt | 3 +-- docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt | 3 +-- docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.pt | 3 +-- docs/tutorials/wiki2/src/views/tutorial/templates/edit.pt | 3 +-- docs/tutorials/wiki2/src/views/tutorial/templates/mytemplate.pt | 3 +-- docs/tutorials/wiki2/src/views/tutorial/templates/view.pt | 3 +-- 18 files changed, 18 insertions(+), 36 deletions(-) diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt index 0e5858d3b..3cc61c432 100644 --- a/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt +++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt @@ -7,8 +7,7 @@ - - + diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt index 974e22f37..01944357f 100644 --- a/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt +++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt @@ -7,8 +7,7 @@ - - + diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt index 4bd01e73e..e31a342b2 100644 --- a/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt +++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt @@ -7,8 +7,7 @@ - - + diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt index 3fd709338..0a7ecdc6e 100644 --- a/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt +++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt @@ -7,8 +7,7 @@ - - + diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt index 98f178b31..2a2340683 100644 --- a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt +++ b/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt @@ -7,8 +7,7 @@ - - + diff --git a/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt index 4bd01e73e..e31a342b2 100644 --- a/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt +++ b/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt @@ -7,8 +7,7 @@ - - + diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt b/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt index 077a0dcb7..902c1e5a6 100644 --- a/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt +++ b/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt @@ -7,8 +7,7 @@ - - + diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt index 4bd01e73e..e31a342b2 100644 --- a/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt +++ b/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt @@ -7,8 +7,7 @@ - - + diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/view.pt b/docs/tutorials/wiki/src/views/tutorial/templates/view.pt index f676c1d25..d6b137e27 100644 --- a/docs/tutorials/wiki/src/views/tutorial/templates/view.pt +++ b/docs/tutorials/wiki/src/views/tutorial/templates/view.pt @@ -7,8 +7,7 @@ - - + diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/templates/edit.pt b/docs/tutorials/wiki2/src/authorization/tutorial/templates/edit.pt index e8c59eb10..a450fb5d0 100644 --- a/docs/tutorials/wiki2/src/authorization/tutorial/templates/edit.pt +++ b/docs/tutorials/wiki2/src/authorization/tutorial/templates/edit.pt @@ -7,8 +7,7 @@ - - + diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/templates/login.pt b/docs/tutorials/wiki2/src/authorization/tutorial/templates/login.pt index 974e22f37..01944357f 100644 --- a/docs/tutorials/wiki2/src/authorization/tutorial/templates/login.pt +++ b/docs/tutorials/wiki2/src/authorization/tutorial/templates/login.pt @@ -7,8 +7,7 @@ - - + diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki2/src/authorization/tutorial/templates/mytemplate.pt index 4bd01e73e..e31a342b2 100644 --- a/docs/tutorials/wiki2/src/authorization/tutorial/templates/mytemplate.pt +++ b/docs/tutorials/wiki2/src/authorization/tutorial/templates/mytemplate.pt @@ -7,8 +7,7 @@ - - + diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/templates/view.pt b/docs/tutorials/wiki2/src/authorization/tutorial/templates/view.pt index d0360429c..809704072 100644 --- a/docs/tutorials/wiki2/src/authorization/tutorial/templates/view.pt +++ b/docs/tutorials/wiki2/src/authorization/tutorial/templates/view.pt @@ -7,8 +7,7 @@ - - + diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt index 4bd01e73e..e31a342b2 100644 --- a/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt +++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt @@ -7,8 +7,7 @@ - - + diff --git a/docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.pt index 4bd01e73e..e31a342b2 100644 --- a/docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.pt +++ b/docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.pt @@ -7,8 +7,7 @@ - - + diff --git a/docs/tutorials/wiki2/src/views/tutorial/templates/edit.pt b/docs/tutorials/wiki2/src/views/tutorial/templates/edit.pt index b45cea3c6..4fdbbc19d 100644 --- a/docs/tutorials/wiki2/src/views/tutorial/templates/edit.pt +++ b/docs/tutorials/wiki2/src/views/tutorial/templates/edit.pt @@ -7,8 +7,7 @@ - - + diff --git a/docs/tutorials/wiki2/src/views/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki2/src/views/tutorial/templates/mytemplate.pt index 4bd01e73e..e31a342b2 100644 --- a/docs/tutorials/wiki2/src/views/tutorial/templates/mytemplate.pt +++ b/docs/tutorials/wiki2/src/views/tutorial/templates/mytemplate.pt @@ -7,8 +7,7 @@ - - + diff --git a/docs/tutorials/wiki2/src/views/tutorial/templates/view.pt b/docs/tutorials/wiki2/src/views/tutorial/templates/view.pt index cacb58788..8f171a96b 100644 --- a/docs/tutorials/wiki2/src/views/tutorial/templates/view.pt +++ b/docs/tutorials/wiki2/src/views/tutorial/templates/view.pt @@ -7,8 +7,7 @@ - - + -- cgit v1.2.3 From dd4a6e7635c497c20c4a361aad95a955bf2c9b3e Mon Sep 17 00:00:00 2001 From: Blaise Laflamme Date: Wed, 12 Jan 2011 23:25:04 -0500 Subject: Changed google font link and use request.static_url in myproject --- docs/narr/MyProject/myproject/templates/mytemplate.pt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/docs/narr/MyProject/myproject/templates/mytemplate.pt b/docs/narr/MyProject/myproject/templates/mytemplate.pt index ec22ef396..165ef9c0b 100644 --- a/docs/narr/MyProject/myproject/templates/mytemplate.pt +++ b/docs/narr/MyProject/myproject/templates/mytemplate.pt @@ -5,19 +5,18 @@ - - - - + + +
                                      -
                                      pyramid
                                      +
                                      pyramid
                                      -- cgit v1.2.3 From ec99888c9c15f1ee17157d252ef64ed161042129 Mon Sep 17 00:00:00 2001 From: Blaise Laflamme Date: Wed, 12 Jan 2011 23:43:06 -0500 Subject: Reformatted myproject mytemplate.pt --- .../MyProject/myproject/templates/mytemplate.pt | 171 ++++++++++++--------- 1 file changed, 101 insertions(+), 70 deletions(-) diff --git a/docs/narr/MyProject/myproject/templates/mytemplate.pt b/docs/narr/MyProject/myproject/templates/mytemplate.pt index 165ef9c0b..0bfea9d53 100644 --- a/docs/narr/MyProject/myproject/templates/mytemplate.pt +++ b/docs/narr/MyProject/myproject/templates/mytemplate.pt @@ -1,75 +1,106 @@ - - + + - The Pyramid Web Application Development Framework - - - - - - - + The Pyramid Web Application Development Framework + + + + + + + -
                                      -
                                      -
                                      -
                                      pyramid
                                      -
                                      -
                                      -
                                      -
                                      -

                                      - Welcome to ${project}, an application generated by
                                      - the Pyramid web application development framework. -

                                      -
                                      -
                                      -
                                      -
                                      -
                                      -

                                      Search documentation

                                      -
                                      - - -
                                      -
                                      - -
                                      -
                                      -
                                      - +
                                      +
                                      +
                                      +
                                      + pyramid +
                                      +
                                      +
                                      +
                                      +
                                      +

                                      + Welcome to ${project}, + an application generated by
                                      + the Pyramid web application development framework. +

                                      +
                                      +
                                      + +
                                      + \ No newline at end of file -- cgit v1.2.3 From 6fd291025098dfeba2872459a0a9ff64f9de3dce Mon Sep 17 00:00:00 2001 From: Rob Miller Date: Wed, 12 Jan 2011 23:48:37 -0800 Subject: Minor edits, typo fixes, term consistency changes. --- docs/narr/muchadoabouttraversal.rst | 79 ++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 40 deletions(-) diff --git a/docs/narr/muchadoabouttraversal.rst b/docs/narr/muchadoabouttraversal.rst index bc1b48462..375f6e927 100644 --- a/docs/narr/muchadoabouttraversal.rst +++ b/docs/narr/muchadoabouttraversal.rst @@ -43,12 +43,12 @@ ever used a run-of-the-mill file system with folders and files. URL Dispatch ------------ -Let's step back and consider the problem we're trying to solve, which is -simple. An HTTP request for a particular path has been routed to our web -application. The requested path will possibly invoke a specific :term:`view -callable` function defined somewhere in our app. We're trying to determine -*which* callable function, if any, should be invoked for a given requested -URL. +Let's step back and consider the problem we're trying to solve. An +HTTP request for a particular path has been routed to our web +application. The requested path will possibly invoke a specific +:term:`view callable` function defined somewhere in our app. We're +trying to determine *which* callable function, if any, should be +invoked for a given requested URL. Many systems, including Pyramid, offer a simple solution. They offer the concept of "URL matching". URL matching approaches this problem by parsing @@ -59,10 +59,9 @@ request path matches a specific pattern, the associated function is called. If the request path matches more than one pattern, some conflict resolution scheme is used, usually a simple order precedence so that the first match will take priority over any subsequent matches. If a request path doesn't -match any of the defined patterns, :app:`Pyramid` a "404 Not Found" response -is returned. +match any of the defined patterns, a "404 Not Found" response is returned. -In Pyramid, we offer an implementation of URL mapping which we call +In Pyramid, we offer an implementation of URL matching which we call :term:`URL dispatch`. Using :app:`Pyramid` syntax, we might have a match pattern such as ``/{userid}/photos/{photoid}``, mapped to a ``photo_view()`` function defined somewhere in our code. Then a request for a path such as @@ -115,7 +114,7 @@ then you understand view lookup. The major difference between file system lookup and traversal is that a file system lookup steps through nested directories and files in a file system -tree, while traversal steps through nested dictionary-type objects in an +tree, while traversal steps through nested dictionary-type objects in a :term:`resource tree`. Let's take a detailed look at one of our example paths, so we can see what I mean: @@ -123,7 +122,7 @@ The path ``/joeschmoe/photos/photo1``, has four segments: ``/``, ``joeschmoe``, ``photos`` and ``photo1``. With file system lookup we might have a root folder (``/``) containing a nested folder (``joeschmoe``), which contains another nested folder (``photos``), which finally contains a JPG -file ("photo1"). With traversal, we instead have a dictionary-like root +file (``photo1``). With traversal, we instead have a dictionary-like root object. Asking for the ``joeschmoe`` key gives us another dictionary-like object. Asking this in turn for the ``photos`` key gives us yet another mapping object, which finally (hopefully) contains the resource that we're @@ -154,9 +153,9 @@ Since :app:`Pyramid` is not a highly opinionated framework, it makes no restriction on how a :term:`resource` is implemented; a developer can implement them as he wishes. One common pattern used is to persist all of the resources, including the root, in a database as a graph. The root object -is a dictionarylike object. Dictionarylike objects in Python supply a +is a dictionary-like object. Dictionary-like objects in Python supply a ``__getitem__`` method which is called when key lookup is done. Under the -hood, when ``adict`` is a dictionarylike object, Python translates +hood, when ``adict`` is a dictionary-like object, Python translates ``adict['a']`` to ``adict.__getitem__('a')``. Try doing this in a Python interpreter prompt if you don't believe us: @@ -174,7 +173,7 @@ interpreter prompt if you don't believe us: 1 -The dictionarylike root object stores the ids of all of its subresources as +The dictionary-like root object stores the ids of all of its subresources as keys, and provides a ``__getitem__`` implementation that fetches them. So ``get_root()`` fetches the unique root object, while ``get_root()['joeschmoe']`` returns a different object, also stored in the @@ -185,12 +184,13 @@ days, or anywhere else, it doesn't matter. As long as the returned objects provide the dictionary-like API (i.e. as long as they have an appropriately implemented ``__getitem__`` method) then traversal will work. -In fact, you don't need a "database" at all. You could trivially implement a -set of objects with ``__getitem__`` methods that search for files in specific -directories, and thus precisely recreate the older mechanism of having the -URL path mapped directly to a folder structure on the file system. Or you -could use plain dictionaries too. Traversal is in fact a superset of file -system lookup. +In fact, you don't need a "database" at all. You could use plain +dictionaries, with your site's URL structure hard-coded directly in +the Python source. Or you could trivially implement a set of objects +with ``__getitem__`` methods that search for files in specific +directories, and thus precisely recreate the traditional mechanism of +having the URL path mapped directly to a folder structure on the file +system. Traversal is in fact a superset of file system lookup. .. note:: See the chapter entitled :ref:`resources_chapter` for a more technical overview of resources. @@ -207,13 +207,14 @@ that you might want to take after finding a :term:`resource`. With our photo example, for instance, you might want to view the photo in a page, but you might also want to provide a way for the user to edit the photo and any associated metadata. We'll call the former the ``view`` view, and the latter -will be the ``edit`` view (Original, I know.) :app:`Pyramid` has a -centralized view registry where named views can be associated with specific -resource types. So in our example, we'll assume that we've registered -``view`` and ``edit`` views for photo objects, and that we've specified the -``view`` view as the default, so that ``/joeschmoe/photos/photo1/view`` and -``/joeschmoe/photos/photo1`` are equivalent. The edit view would sensibly be -provided by a request for ``/joeschmoe/photos/photo1/edit``. +will be the ``edit`` view. (Original, I know.) :app:`Pyramid` has a +centralized view :term:`registry` where named views can be associated with +specific resource types. So in our example, we'll assume that we've +registered ``view`` and ``edit`` views for photo objects, and that we've +specified the ``view`` view as the default, so that +``/joeschmoe/photos/photo1/view`` and ``/joeschmoe/photos/photo1`` are +equivalent. The edit view would sensibly be provided by a request for +``/joeschmoe/photos/photo1/edit``. Hopefully it's clear that the first portion of the edit view's URL path is going to resolve to the same resource as the non-edit version, specifically @@ -232,15 +233,15 @@ response. You might conceptualize a request for ``/joeschmoe/photos/photo1/edit`` as ultimately converted into the following piece of Pythonic pseudocode:: - + context = get_root()['joeschmoe']['photos']['photo1'] view_callable = get_view(context, 'edit') request.context = context view_callable(request) The ``get_root`` and ``get_view`` functions don't really exist. Internally, -:app:`Pyramid` does something more complicated. But the example above is a -reasonable approximation of the view lookup algorithm in pseudocode. +:app:`Pyramid` does something more complicated. But the example above +is a reasonable approximation of the view lookup algorithm in pseudocode. Use Cases --------- @@ -264,20 +265,18 @@ folder. He might decide to nest folders dozens of layers deep. How will you construct matching patterns that could account for every possible combination of paths that might develop? -It's possible, but it will make for some somewhat ugly URLs. And the -matching patterns are going to become complex quickly as you try to handle -all of the edge cases. +It might be possible, but it certainly won't be easy. The matching +patterns are going to become complex quickly as you try to handle all +of the edge cases. -With traversal, however, it's straightforward. If you want 20 layers of -nesting, it's no problem. :app:`Pyramid` will happily call ``__getitem__`` +With traversal, however, it's straightforward. 20 layers of nesting would be + no problem. :app:`Pyramid` will happily call ``__getitem__`` as many times as it needs to, until it runs out of path segments or until a resource raises a :exc:`KeyError`. Each resource only needs to know how to fetch its immediate children, the traversal algorithm takes care of the rest. - -One of the key advantages of traversal is that the structure of the resource -tree can live in the database, and not in the code. It's simple to let users -modify the tree at runtime to set up their own personalized directory -structures. +Also, since the structure of the resource tree can live in the database and +not in the code, it's simple to let users modify the tree at runtime to set +up their own personalized "directory" structures. Another use case in which traversal shines is when there is a need to support a context-dependent security policy. One example might be a document -- cgit v1.2.3 From 6500de937460352dc54be28d2bbac8308c1fcf18 Mon Sep 17 00:00:00 2001 From: Rob Miller Date: Wed, 12 Jan 2011 23:49:32 -0800 Subject: ignore emacs backup files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 562abec68..110da816f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ *$py.class *.pt.py *.txt.py +*~ .coverage tutorial.db env26/ -- cgit v1.2.3 From f4fcd32e10f0d863ebc61fc09c81e02d103ffe2e Mon Sep 17 00:00:00 2001 From: Rob Miller Date: Thu, 13 Jan 2011 00:52:40 -0800 Subject: First pass at documenting the __action_decorator__ feature of a view handler. --- docs/narr/viewconfig.rst | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst index f8b3fdb24..c11fc1697 100644 --- a/docs/narr/viewconfig.rst +++ b/docs/narr/viewconfig.rst @@ -841,6 +841,35 @@ configuration that results in calling the ``show_template`` method, then rendering the template with ``home.mak``, and the url ``/hello/about`` will call the same method and render the ``about.mak`` template. +Handler ``__action_decorator__`` Attribute +++++++++++++++++++++++++++++++++++++++++++ + +If a handler class has an ``__action_decorator__`` attribute, then the +value of the class attribute will be passed in as the ``decorator`` +argument every time a handler action is registered as a view callable. +This means that, like anything passed to ``add_view()`` as the +``decorator`` argument, ``__action_decorator__`` must be a callable +accepting a single argument. This argument will itself be a callable +accepting ``(context, request)`` arguments, and +``__action_decorator__`` must return a replacement callable with the +same call signature. + +Note that, since handler actions are registered as views against the +handler class and not a handler instance, any ``__action_decorator__`` +attribute must *not* be a regular instance method. Defining an +``__action_decorator__`` instance method on a handler class will +result in a :exc:`ConfigurationError`. Instead, ``__action_decorator__`` +can be any other type of callable: a staticmethod, classmethod, function, +or some sort of callable instance. + +.. note:: + + In a Pylons 1.0 controller, it was possible to override the ``__call__()`` + method, which allowed a developer to "wrap" the entire action invocation, + with a try/except or any other arbitrary code. In :app:`Pyramid`, this + can be emulated with the use of an ``__action_decorator__`` classmethod + on your handler class. + .. index:: single: resource interfaces -- cgit v1.2.3