[Python-modules-commits] [python-pyramid] 05/05: merge patched into master

Barry Warsaw barry at moszumanska.debian.org
Mon Jan 4 19:08:57 UTC 2016


This is an automated email from the git hooks/post-receive script.

barry pushed a commit to branch master
in repository python-pyramid.

commit 671803e0b990838193a64b6b94e35c314616987f
Merge: c59f11b 04197cf
Author: Barry Warsaw <barry at ubuntu.com>
Date:   Mon Jan 4 13:46:33 2016 -0500

    merge patched into master

 .gitignore                                         |    3 +
 .travis.yml                                        |   37 +-
 CHANGES.txt                                        | 1023 +-
 CONTRIBUTORS.txt                                   |   20 +
 HACKING.txt                                        |   72 +-
 HISTORY.txt                                        |  686 +-
 PKG-INFO                                           | 1050 +--
 README.rst                                         |   25 +-
 RELEASING.txt                                      |   36 +-
 TODO.txt                                           |    5 +-
 builddocs.sh                                       |    3 +
 contributing.md                                    |  107 +
 coverage.sh                                        |    3 +
 debian/.git-dpm                                    |    6 +-
 debian/patches/getargspec-is-deprecated.patch      |   51 -
 debian/patches/series                              |    1 -
 debian/patches/tweak-requirements.patch            |    4 +-
 docs/.gitignore                                    |    3 +
 docs/Makefile                                      |   92 +
 docs/_static/latex-note.png                        |  Bin 0 -> 3844 bytes
 docs/_static/latex-warning.png                     |  Bin 0 -> 3542 bytes
 docs/_static/pyramid_request_processing.graffle    | 9748 ++++++++++++++++++++
 docs/_static/pyramid_request_processing.png        |  Bin 0 -> 122854 bytes
 docs/_static/pyramid_request_processing.svg        |    3 +
 docs/_static/pyramid_router.graffle                | 1621 ++++
 docs/_static/pyramid_router.png                    |  Bin 0 -> 120643 bytes
 docs/_static/pyramid_router.svg                    |    3 +
 docs/api/authentication.rst                        |   38 +
 docs/api/authorization.rst                         |    9 +
 docs/api/compat.rst                                |  156 +
 docs/api/config.rst                                |  139 +
 docs/api/decorator.rst                             |    9 +
 docs/api/events.rst                                |   40 +
 docs/api/exceptions.rst                            |   18 +
 docs/api/httpexceptions.rst                        |  108 +
 docs/api/i18n.rst                                  |   33 +
 docs/api/index.rst                                 |   12 +
 docs/api/interfaces.rst                            |   93 +
 docs/api/location.rst                              |   12 +
 docs/api/paster.rst                                |   14 +
 docs/api/path.rst                                  |   19 +
 docs/api/registry.rst                              |   75 +
 docs/api/renderers.rst                             |   30 +
 docs/api/request.rst                               |  372 +
 docs/api/response.rst                              |   21 +
 docs/api/scaffolds.rst                             |   13 +
 docs/api/scripting.rst                             |   11 +
 docs/api/security.rst                              |   94 +
 docs/api/session.rst                               |   21 +
 docs/api/settings.rst                              |   12 +
 docs/api/static.rst                                |   19 +
 docs/api/testing.rst                               |   26 +
 docs/api/threadlocal.rst                           |   11 +
 docs/api/traversal.rst                             |   25 +
 docs/api/tweens.rst                                |   25 +
 docs/api/url.rst                                   |   23 +
 docs/api/view.rst                                  |   26 +
 docs/api/wsgi.rst                                  |   10 +
 docs/authorintro.rst                               |  189 +
 docs/changes.rst                                   |   13 +
 docs/conf.py                                       |  426 +
 docs/conventions.rst                               |  114 +
 docs/convert_images.sh                             |   12 +
 docs/copyright.rst                                 |  104 +
 docs/coversizing.py                                |   19 +
 docs/designdefense.rst                             | 1707 ++++
 docs/foreword.rst                                  |   83 +
 docs/glossary.rst                                  | 1095 +++
 docs/index.rst                                     |  233 +
 docs/latexindex.rst                                |  102 +
 docs/make_book                                     |    4 +
 docs/make_epub                                     |    2 +
 docs/make_pdf                                      |    4 +
 docs/narr/MyProject/CHANGES.txt                    |    4 +
 docs/narr/MyProject/MANIFEST.in                    |    2 +
 docs/narr/MyProject/README.txt                     |    1 +
 .../narr/MyProject/development.ini                 |   14 +-
 docs/narr/MyProject/myproject/__init__.py          |   12 +
 .../MyProject/myproject/static/pyramid-16x16.png   |  Bin 0 -> 1319 bytes
 docs/narr/MyProject/myproject/static/pyramid.png   |  Bin 0 -> 12901 bytes
 .../narr/MyProject/myproject}/static/theme.css     |    0
 .../narr/MyProject/myproject}/static/theme.min.css |    0
 .../MyProject/myproject/templates/mytemplate.pt    |   18 +-
 docs/narr/MyProject/myproject/tests.py             |   29 +
 docs/narr/MyProject/myproject/views.py             |    6 +
 .../narr/MyProject/production.ini                  |   12 +-
 docs/narr/MyProject/setup.py                       |   53 +
 docs/narr/advconfig.rst                            |  423 +
 docs/narr/assets.rst                               |  874 ++
 docs/narr/commandline.rst                          | 1039 +++
 docs/narr/configuration.rst                        |  154 +
 docs/narr/environment.rst                          |  555 ++
 docs/narr/events.rst                               |  229 +
 docs/narr/extconfig.rst                            |  461 +
 docs/narr/extending.rst                            |  292 +
 docs/narr/firstapp.rst                             |  250 +
 docs/narr/hellotraversal.py                        |   22 +
 docs/narr/hellotraversal.rst                       |   64 +
 docs/narr/helloworld.py                            |   16 +
 docs/narr/hooks.rst                                | 1549 ++++
 docs/narr/hybrid.rst                               |  548 ++
 docs/narr/i18n.rst                                 |  957 ++
 docs/narr/install.rst                              |  384 +
 docs/narr/introduction.rst                         |  985 ++
 docs/narr/introspector.rst                         |  593 ++
 docs/narr/logging.rst                              |  430 +
 docs/narr/muchadoabouttraversal.rst                |  313 +
 docs/narr/paste.rst                                |   98 +
 docs/narr/project-debug.png                        |  Bin 0 -> 202464 bytes
 docs/narr/project-show-toolbar.png                 |  Bin 0 -> 11050 bytes
 docs/narr/project.png                              |  Bin 0 -> 133242 bytes
 docs/narr/project.rst                              | 1039 +++
 docs/narr/renderers.rst                            |  666 ++
 docs/narr/resources.rst                            |  699 ++
 docs/narr/resourcetreetraverser.png                |  Bin 0 -> 232233 bytes
 docs/narr/router.png                               |  Bin 0 -> 177022 bytes
 docs/narr/router.rst                               |  126 +
 docs/narr/scaffolding.rst                          |  180 +
 docs/narr/security.rst                             |  759 ++
 docs/narr/sessions.rst                             |  424 +
 docs/narr/startup.rst                              |  159 +
 docs/narr/subrequest.rst                           |  281 +
 docs/narr/tb_introspector.png                      |  Bin 0 -> 181225 bytes
 docs/narr/templates.rst                            |  457 +
 docs/narr/testing.rst                              |  433 +
 docs/narr/threadlocals.rst                         |  144 +
 docs/narr/traversal.rst                            |  544 ++
 docs/narr/upgrading.rst                            |  229 +
 docs/narr/urldispatch.rst                          | 1367 +++
 docs/narr/vhosting.rst                             |  145 +
 docs/narr/viewconfig.rst                           | 1043 +++
 docs/narr/views.rst                                |  597 ++
 docs/narr/webob.rst                                |  499 +
 docs/narr/zca.rst                                  |  243 +
 docs/pscripts/index.rst                            |   12 +
 docs/pscripts/pcreate.rst                          |   13 +
 docs/pscripts/pdistreport.rst                      |   13 +
 docs/pscripts/prequest.rst                         |   13 +
 docs/pscripts/proutes.rst                          |   13 +
 docs/pscripts/pserve.rst                           |   13 +
 docs/pscripts/pshell.rst                           |   13 +
 docs/pscripts/ptweens.rst                          |   13 +
 docs/pscripts/pviews.rst                           |   13 +
 docs/python-3.png                                  |  Bin 0 -> 8858 bytes
 docs/quick_tour.rst                                |  906 ++
 docs/quick_tour/awesome/CHANGES.txt                |    4 +
 docs/quick_tour/awesome/MANIFEST.in                |    2 +
 docs/quick_tour/awesome/README.txt                 |    4 +
 docs/quick_tour/awesome/awesome/__init__.py        |   23 +
 docs/quick_tour/awesome/awesome/locale/awesome.pot |   21 +
 .../awesome/locale/de/LC_MESSAGES/awesome.mo       |  Bin 0 -> 460 bytes
 .../awesome/locale/de/LC_MESSAGES/awesome.po       |   21 +
 .../awesome/locale/fr/LC_MESSAGES/awesome.mo       |  Bin 0 -> 461 bytes
 .../awesome/locale/fr/LC_MESSAGES/awesome.po       |   21 +
 docs/quick_tour/awesome/awesome/models.py          |    8 +
 docs/quick_tour/awesome/awesome/static/favicon.ico |  Bin 0 -> 1406 bytes
 docs/quick_tour/awesome/awesome/static/logo.png    |  Bin 0 -> 6641 bytes
 docs/quick_tour/awesome/awesome/static/pylons.css  |   73 +
 .../awesome/awesome/templates/mytemplate.jinja2    |   87 +
 docs/quick_tour/awesome/awesome/tests.py           |   21 +
 docs/quick_tour/awesome/awesome/views.py           |    6 +
 docs/quick_tour/awesome/development.ini            |   49 +
 docs/quick_tour/awesome/message-extraction.ini     |    3 +
 docs/quick_tour/awesome/setup.py                   |   36 +
 docs/quick_tour/hello_world/app.py                 |   16 +
 docs/quick_tour/jinja2/app.py                      |   11 +
 docs/quick_tour/jinja2/hello_world.jinja2          |    9 +
 docs/quick_tour/jinja2/views.py                    |    8 +
 docs/quick_tour/json/app.py                        |   15 +
 docs/quick_tour/json/hello_world.jinja2            |   10 +
 docs/quick_tour/json/hello_world.pt                |   17 +
 docs/quick_tour/json/views.py                      |   13 +
 docs/quick_tour/package/CHANGES.txt                |    4 +
 docs/quick_tour/package/MANIFEST.in                |    2 +
 docs/quick_tour/package/README.txt                 |    4 +
 docs/quick_tour/package/development.ini            |   54 +
 docs/quick_tour/package/hello_world/__init__.py    |   34 +
 docs/quick_tour/package/hello_world/init.py        |   34 +
 .../locale/de/LC_MESSAGES/hello_world.mo           |  Bin 0 -> 460 bytes
 .../locale/de/LC_MESSAGES/hello_world.po           |   21 +
 .../locale/fr/LC_MESSAGES/hello_world.mo           |  Bin 0 -> 461 bytes
 .../locale/fr/LC_MESSAGES/hello_world.po           |   21 +
 .../package/hello_world/locale/hello_world.pot     |   21 +
 docs/quick_tour/package/hello_world/models.py      |    8 +
 .../package/hello_world/static/favicon.ico         |  Bin 0 -> 1406 bytes
 .../quick_tour/package/hello_world/static/logo.png |  Bin 0 -> 6641 bytes
 .../package/hello_world/static/pylons.css          |   73 +
 .../hello_world/templates/mytemplate.jinja2        |   90 +
 docs/quick_tour/package/hello_world/tests.py       |   20 +
 docs/quick_tour/package/hello_world/views.py       |   22 +
 docs/quick_tour/package/message-extraction.ini     |    3 +
 docs/quick_tour/package/setup.py                   |   41 +
 docs/quick_tour/requests/app.py                    |   24 +
 docs/quick_tour/routing/app.py                     |   12 +
 docs/quick_tour/routing/views.py                   |   10 +
 docs/quick_tour/sqla_demo/CHANGES.txt              |    4 +
 docs/quick_tour/sqla_demo/MANIFEST.in              |    2 +
 docs/quick_tour/sqla_demo/README.txt               |   14 +
 .../quick_tour/sqla_demo/development.ini           |   14 +-
 .../quick_tour/sqla_demo/production.ini            |   14 +-
 docs/quick_tour/sqla_demo/setup.py                 |   44 +
 docs/quick_tour/sqla_demo/sqla_demo.sqlite         |  Bin 0 -> 3072 bytes
 docs/quick_tour/sqla_demo/sqla_demo/__init__.py    |   20 +
 docs/quick_tour/sqla_demo/sqla_demo/models.py      |   29 +
 .../sqla_demo/sqla_demo/scripts/__init__.py        |    1 +
 .../sqla_demo/sqla_demo/scripts/initializedb.py    |   37 +
 .../sqla_demo/sqla_demo/static/favicon.ico         |  Bin 0 -> 1406 bytes
 .../sqla_demo/sqla_demo/static/footerbg.png        |  Bin 0 -> 333 bytes
 .../sqla_demo/sqla_demo/static/headerbg.png        |  Bin 0 -> 203 bytes
 docs/quick_tour/sqla_demo/sqla_demo/static/ie6.css |    8 +
 .../sqla_demo/sqla_demo/static/middlebg.png        |  Bin 0 -> 2797 bytes
 .../sqla_demo/sqla_demo/static/pylons.css          |  372 +
 .../sqla_demo/sqla_demo/static/pyramid-small.png   |  Bin 0 -> 7044 bytes
 .../sqla_demo/sqla_demo/static/pyramid.png         |  Bin 0 -> 33055 bytes
 .../sqla_demo/sqla_demo/static/transparent.gif     |  Bin 0 -> 49 bytes
 .../sqla_demo/sqla_demo/templates/mytemplate.pt    |   76 +
 docs/quick_tour/sqla_demo/sqla_demo/tests.py       |   33 +
 docs/quick_tour/sqla_demo/sqla_demo/views.py       |   37 +
 docs/quick_tour/static_assets/app.py               |   14 +
 docs/quick_tour/static_assets/hello_world.jinja2   |   10 +
 docs/quick_tour/static_assets/hello_world.pt       |   16 +
 docs/quick_tour/static_assets/static/app.css       |    4 +
 docs/quick_tour/static_assets/views.py             |    6 +
 docs/quick_tour/templating/app.py                  |   10 +
 docs/quick_tour/templating/hello_world.pt          |    9 +
 docs/quick_tour/templating/views.py                |    8 +
 docs/quick_tour/view_classes/app.py                |   13 +
 docs/quick_tour/view_classes/delete.jinja2         |    9 +
 docs/quick_tour/view_classes/edit.jinja2           |    9 +
 docs/quick_tour/view_classes/hello.jinja2          |   17 +
 docs/quick_tour/view_classes/views.py              |   32 +
 docs/quick_tour/views/app.py                       |   13 +
 docs/quick_tour/views/views.py                     |   32 +
 docs/quick_tutorial/authentication.rst             |  131 +
 docs/quick_tutorial/authentication/development.ini |   11 +
 docs/quick_tutorial/authentication/setup.py        |   14 +
 .../authentication/tutorial/__init__.py            |   25 +
 .../quick_tutorial/authentication/tutorial/home.pt |   18 +
 .../authentication/tutorial/login.pt               |   25 +
 .../authentication/tutorial/security.py            |    8 +
 .../authentication/tutorial/views.py               |   64 +
 docs/quick_tutorial/authorization.rst              |  115 +
 docs/quick_tutorial/authorization/development.ini  |   11 +
 docs/quick_tutorial/authorization/setup.py         |   14 +
 .../authorization/tutorial/__init__.py             |   26 +
 docs/quick_tutorial/authorization/tutorial/home.pt |   18 +
 .../quick_tutorial/authorization/tutorial/login.pt |   25 +
 .../authorization/tutorial/resources.py            |    9 +
 .../authorization/tutorial/security.py             |    8 +
 .../quick_tutorial/authorization/tutorial/views.py |   66 +
 docs/quick_tutorial/conf.py                        |  281 +
 docs/quick_tutorial/databases.rst                  |  200 +
 docs/quick_tutorial/databases/development.ini      |   49 +
 docs/quick_tutorial/databases/setup.py             |   20 +
 docs/quick_tutorial/databases/sqltutorial.sqlite   |  Bin 0 -> 12288 bytes
 docs/quick_tutorial/databases/tutorial/__init__.py |   21 +
 .../databases/tutorial/initialize_db.py            |   37 +
 docs/quick_tutorial/databases/tutorial/models.py   |   35 +
 docs/quick_tutorial/databases/tutorial/tests.py    |   56 +
 docs/quick_tutorial/databases/tutorial/views.py    |   96 +
 .../quick_tutorial/databases/tutorial/wiki_view.pt |   19 +
 .../databases/tutorial/wikipage_addedit.pt         |   24 +
 .../databases/tutorial/wikipage_view.pt            |   17 +
 docs/quick_tutorial/debugtoolbar.rst               |  112 +
 docs/quick_tutorial/debugtoolbar/development.ini   |    9 +
 docs/quick_tutorial/debugtoolbar/setup.py          |   13 +
 .../debugtoolbar/tutorial/__init__.py              |   13 +
 docs/quick_tutorial/forms.rst                      |  148 +
 docs/quick_tutorial/forms/development.ini          |   10 +
 docs/quick_tutorial/forms/setup.py                 |   15 +
 docs/quick_tutorial/forms/tutorial/__init__.py     |   13 +
 docs/quick_tutorial/forms/tutorial/tests.py        |   36 +
 docs/quick_tutorial/forms/tutorial/views.py        |   96 +
 docs/quick_tutorial/forms/tutorial/wiki_view.pt    |   19 +
 .../forms/tutorial/wikipage_addedit.pt             |   24 +
 .../quick_tutorial/forms/tutorial/wikipage_view.pt |   17 +
 docs/quick_tutorial/functional_testing.rst         |   73 +
 .../functional_testing/development.ini             |    9 +
 docs/quick_tutorial/functional_testing/setup.py    |   13 +
 .../functional_testing/tutorial/__init__.py        |   13 +
 .../functional_testing/tutorial/tests.py           |   31 +
 docs/quick_tutorial/hello_world.rst                |  114 +
 docs/quick_tutorial/hello_world/app.py             |   17 +
 docs/quick_tutorial/index.rst                      |   50 +
 docs/quick_tutorial/ini.rst                        |  142 +
 docs/quick_tutorial/ini/development.ini            |    7 +
 docs/quick_tutorial/ini/setup.py                   |   13 +
 docs/quick_tutorial/ini/tutorial/__init__.py       |   13 +
 docs/quick_tutorial/jinja2.rst                     |   88 +
 docs/quick_tutorial/jinja2/development.ini         |   10 +
 docs/quick_tutorial/jinja2/setup.py                |   13 +
 docs/quick_tutorial/jinja2/tutorial/__init__.py    |   10 +
 docs/quick_tutorial/jinja2/tutorial/home.jinja2    |    9 +
 docs/quick_tutorial/jinja2/tutorial/tests.py       |   44 +
 docs/quick_tutorial/jinja2/tutorial/views.py       |   18 +
 docs/quick_tutorial/json.rst                       |  103 +
 docs/quick_tutorial/json/development.ini           |   10 +
 docs/quick_tutorial/json/setup.py                  |   14 +
 docs/quick_tutorial/json/tutorial/__init__.py      |   11 +
 docs/quick_tutorial/json/tutorial/home.pt          |    9 +
 docs/quick_tutorial/json/tutorial/tests.py         |   50 +
 docs/quick_tutorial/json/tutorial/views.py         |   19 +
 docs/quick_tutorial/logging.rst                    |   80 +
 docs/quick_tutorial/logging/development.ini        |   41 +
 docs/quick_tutorial/logging/setup.py               |   14 +
 docs/quick_tutorial/logging/tutorial/__init__.py   |   10 +
 docs/quick_tutorial/logging/tutorial/home.pt       |    9 +
 docs/quick_tutorial/logging/tutorial/tests.py      |   44 +
 docs/quick_tutorial/logging/tutorial/views.py      |   23 +
 docs/quick_tutorial/more_view_classes.rst          |  198 +
 .../more_view_classes/development.ini              |   10 +
 docs/quick_tutorial/more_view_classes/setup.py     |   14 +
 .../more_view_classes/tutorial/__init__.py         |   10 +
 .../more_view_classes/tutorial/delete.pt           |    9 +
 .../more_view_classes/tutorial/edit.pt             |   10 +
 .../more_view_classes/tutorial/hello.pt            |   16 +
 .../more_view_classes/tutorial/home.pt             |   12 +
 .../more_view_classes/tutorial/tests.py            |   31 +
 .../more_view_classes/tutorial/views.py            |   39 +
 docs/quick_tutorial/package.rst                    |  111 +
 docs/quick_tutorial/package/setup.py               |    9 +
 docs/quick_tutorial/package/tutorial/__init__.py   |    1 +
 docs/quick_tutorial/package/tutorial/app.py        |   17 +
 docs/quick_tutorial/request_response.rst           |  106 +
 .../request_response/development.ini               |   10 +
 docs/quick_tutorial/request_response/setup.py      |   13 +
 .../request_response/tutorial/__init__.py          |    9 +
 .../request_response/tutorial/tests.py             |   54 +
 .../request_response/tutorial/views.py             |   22 +
 docs/quick_tutorial/requirements.rst               |  263 +
 docs/quick_tutorial/retail_forms/development.ini   |   10 +
 docs/quick_tutorial/retail_forms/setup.py          |   15 +
 .../retail_forms/tutorial/__init__.py              |   13 +
 docs/quick_tutorial/retail_forms/tutorial/tests.py |   36 +
 docs/quick_tutorial/retail_forms/tutorial/views.py |   96 +
 .../retail_forms/tutorial/wiki_view.pt             |   19 +
 .../retail_forms/tutorial/wikipage_addedit.pt      |   37 +
 .../retail_forms/tutorial/wikipage_view.pt         |   17 +
 docs/quick_tutorial/routing.rst                    |  121 +
 docs/quick_tutorial/routing/development.ini        |   10 +
 docs/quick_tutorial/routing/setup.py               |   14 +
 docs/quick_tutorial/routing/tutorial/__init__.py   |    9 +
 docs/quick_tutorial/routing/tutorial/home.pt       |   10 +
 docs/quick_tutorial/routing/tutorial/tests.py      |   36 +
 docs/quick_tutorial/routing/tutorial/views.py      |   20 +
 docs/quick_tutorial/scaffolds.rst                  |   86 +
 docs/quick_tutorial/scaffolds/CHANGES.txt          |    4 +
 docs/quick_tutorial/scaffolds/MANIFEST.in          |    2 +
 docs/quick_tutorial/scaffolds/README.txt           |    1 +
 .../quick_tutorial/scaffolds/development.ini       |   14 +-
 .../quick_tutorial/scaffolds/production.ini        |   12 +-
 .../quick_tutorial/scaffolds/scaffolds/__init__.py |   12 +
 .../scaffolds/scaffolds/static/favicon.ico         |  Bin 0 -> 1406 bytes
 .../scaffolds/scaffolds/static/footerbg.png        |  Bin 0 -> 333 bytes
 .../scaffolds/scaffolds/static/headerbg.png        |  Bin 0 -> 203 bytes
 .../scaffolds/scaffolds/static/ie6.css             |    8 +
 .../scaffolds/scaffolds/static/middlebg.png        |  Bin 0 -> 2797 bytes
 .../scaffolds/scaffolds/static/pylons.css          |  372 +
 .../scaffolds/scaffolds/static/pyramid-small.png   |  Bin 0 -> 7044 bytes
 .../scaffolds/scaffolds/static/pyramid.png         |  Bin 0 -> 33055 bytes
 .../scaffolds/scaffolds/static/transparent.gif     |  Bin 0 -> 49 bytes
 .../scaffolds/scaffolds/templates/mytemplate.pt    |   73 +
 docs/quick_tutorial/scaffolds/scaffolds/tests.py   |   17 +
 docs/quick_tutorial/scaffolds/scaffolds/views.py   |    6 +
 docs/quick_tutorial/scaffolds/setup.py             |   42 +
 docs/quick_tutorial/sessions.rst                   |  100 +
 docs/quick_tutorial/sessions/development.ini       |   10 +
 docs/quick_tutorial/sessions/setup.py              |   14 +
 docs/quick_tutorial/sessions/tutorial/__init__.py  |   14 +
 docs/quick_tutorial/sessions/tutorial/home.pt      |   10 +
 docs/quick_tutorial/sessions/tutorial/tests.py     |   44 +
 docs/quick_tutorial/sessions/tutorial/views.py     |   29 +
 docs/quick_tutorial/static_assets.rst              |   91 +
 docs/quick_tutorial/static_assets/development.ini  |   10 +
 docs/quick_tutorial/static_assets/setup.py         |   14 +
 .../static_assets/tutorial/__init__.py             |   11 +
 docs/quick_tutorial/static_assets/tutorial/home.pt |   11 +
 .../static_assets/tutorial/static/app.css          |    4 +
 .../quick_tutorial/static_assets/tutorial/tests.py |   44 +
 .../quick_tutorial/static_assets/tutorial/views.py |   18 +
 docs/quick_tutorial/templating.rst                 |  123 +
 docs/quick_tutorial/templating/development.ini     |   10 +
 docs/quick_tutorial/templating/setup.py            |   14 +
 .../quick_tutorial/templating/tutorial/__init__.py |   10 +
 docs/quick_tutorial/templating/tutorial/home.pt    |    9 +
 docs/quick_tutorial/templating/tutorial/tests.py   |   44 +
 docs/quick_tutorial/templating/tutorial/views.py   |   13 +
 docs/quick_tutorial/tutorial_approach.rst          |   45 +
 docs/quick_tutorial/unit_testing.rst               |  119 +
 docs/quick_tutorial/unit_testing/development.ini   |    9 +
 docs/quick_tutorial/unit_testing/setup.py          |   13 +
 .../unit_testing/tutorial/__init__.py              |   13 +
 docs/quick_tutorial/unit_testing/tutorial/tests.py |   18 +
 docs/quick_tutorial/view_classes.rst               |   98 +
 docs/quick_tutorial/view_classes/development.ini   |   10 +
 docs/quick_tutorial/view_classes/setup.py          |   14 +
 .../view_classes/tutorial/__init__.py              |   10 +
 docs/quick_tutorial/view_classes/tutorial/home.pt  |    9 +
 docs/quick_tutorial/view_classes/tutorial/tests.py |   44 +
 docs/quick_tutorial/view_classes/tutorial/views.py |   17 +
 docs/quick_tutorial/views.rst                      |  122 +
 docs/quick_tutorial/views/development.ini          |    9 +
 docs/quick_tutorial/views/setup.py                 |   13 +
 docs/quick_tutorial/views/tutorial/__init__.py     |    9 +
 docs/quick_tutorial/views/tutorial/tests.py        |   44 +
 docs/quick_tutorial/views/tutorial/views.py        |   14 +
 docs/remake                                        |    1 +
 docs/tutorials/.gitignore                          |    1 +
 docs/tutorials/modwsgi/index.rst                   |  134 +
 docs/tutorials/wiki/NOTE-relocatable.txt           |   13 +
 docs/tutorials/wiki/authorization.rst              |  372 +
 docs/tutorials/wiki/background.rst                 |   21 +
 docs/tutorials/wiki/basiclayout.rst                |  179 +
 docs/tutorials/wiki/definingmodels.rst             |   93 +
 docs/tutorials/wiki/definingviews.rst              |  391 +
 docs/tutorials/wiki/design.rst                     |  149 +
 docs/tutorials/wiki/distributing.rst               |   40 +
 docs/tutorials/wiki/index.rst                      |   29 +
 docs/tutorials/wiki/installation.rst               |  317 +
 docs/tutorials/wiki/src/authorization/CHANGES.txt  |    5 +
 docs/tutorials/wiki/src/authorization/MANIFEST.in  |    2 +
 docs/tutorials/wiki/src/authorization/README.txt   |    4 +
 .../wiki/src/authorization/development.ini         |   12 +-
 .../wiki/src/authorization/production.ini          |   12 +-
 docs/tutorials/wiki/src/authorization/setup.py     |   47 +
 .../wiki/src/authorization/tutorial/__init__.py    |   27 +
 .../wiki/src/authorization/tutorial/models.py      |   29 +
 .../wiki/src/authorization/tutorial/security.py    |    7 +
 .../tutorial/static/pyramid-16x16.png              |  Bin 0 -> 1319 bytes
 .../src/authorization/tutorial/static/pyramid.png  |  Bin 0 -> 12901 bytes
 .../src/authorization/tutorial}/static/theme.css   |    8 +-
 .../authorization/tutorial}/static/theme.min.css   |    0
 .../src/authorization/tutorial/templates/edit.pt   |   40 +-
 .../src/authorization/tutorial/templates/login.pt  |   42 +-
 .../authorization/tutorial/templates/mytemplate.pt |   12 +-
 .../src/authorization/tutorial/templates/view.pt   |   40 +-
 .../wiki/src/authorization/tutorial/tests.py       |  123 +
 .../wiki/src/authorization/tutorial/views.py       |  115 +
 docs/tutorials/wiki/src/basiclayout/CHANGES.txt    |    4 +
 docs/tutorials/wiki/src/basiclayout/MANIFEST.in    |    2 +
 docs/tutorials/wiki/src/basiclayout/README.txt     |    4 +
 .../tutorials/wiki/src/basiclayout/development.ini |   12 +-
 .../tutorials/wiki/src/basiclayout/production.ini  |   12 +-
 docs/tutorials/wiki/src/basiclayout/setup.py       |   46 +
 .../wiki/src/basiclayout/tutorial/__init__.py      |   18 +
 .../wiki/src/basiclayout/tutorial/models.py        |   14 +
 .../basiclayout/tutorial/static/pyramid-16x16.png  |  Bin 0 -> 1319 bytes
 .../src/basiclayout/tutorial/static/pyramid.png    |  Bin 0 -> 12901 bytes
 .../src/basiclayout/tutorial}/static/theme.css     |    8 +-
 .../src/basiclayout/tutorial}/static/theme.min.css |    0
 .../basiclayout/tutorial/templates/mytemplate.pt   |   12 +-
 .../wiki/src/basiclayout/tutorial/tests.py         |   16 +
 .../wiki/src/basiclayout/tutorial/views.py         |    7 +
 docs/tutorials/wiki/src/models/CHANGES.txt         |    4 +
 docs/tutorials/wiki/src/models/MANIFEST.in         |    2 +
 docs/tutorials/wiki/src/models/README.txt          |    4 +
 .../tutorials/wiki/src/models/development.ini      |   12 +-
 .../tutorials/wiki/src/models/production.ini       |   12 +-
 docs/tutorials/wiki/src/models/setup.py            |   46 +
 .../tutorials/wiki/src/models/tutorial/__init__.py |   18 +
 docs/tutorials/wiki/src/models/tutorial/models.py  |   22 +
 .../src/models/tutorial/static/pyramid-16x16.png   |  Bin 0 -> 1319 bytes
 .../wiki/src/models/tutorial/static/pyramid.png    |  Bin 0 -> 12901 bytes
 .../wiki/src/models/tutorial}/static/theme.css     |    8 +-
 .../wiki/src/models/tutorial}/static/theme.min.css |    0
 .../src/models/tutorial/templates/mytemplate.pt    |   12 +-
 docs/tutorials/wiki/src/models/tutorial/tests.py   |   61 +
 docs/tutorials/wiki/src/models/tutorial/views.py   |    7 +
 docs/tutorials/wiki/src/tests/CHANGES.txt          |    5 +
 docs/tutorials/wiki/src/tests/MANIFEST.in          |    2 +
 docs/tutorials/wiki/src/tests/README.txt           |    4 +
 .../tutorials/wiki/src/tests/development.ini       |   12 +-
 .../tutorials/wiki/src/tests/production.ini        |   12 +-
 docs/tutorials/wiki/src/tests/setup.py             |   48 +
 docs/tutorials/wiki/src/tests/tutorial/__init__.py |   27 +
 docs/tutorials/wiki/src/tests/tutorial/models.py   |   29 +
 docs/tutorials/wiki/src/tests/tutorial/security.py |    7 +
 .../src/tests/tutorial/static/pyramid-16x16.png    |  Bin 0 -> 1319 bytes
 .../wiki/src/tests/tutorial/static/pyramid.png     |  Bin 0 -> 12901 bytes
 .../wiki/src/tests/tutorial}/static/theme.css      |    8 +-
 .../wiki/src/tests/tutorial}/static/theme.min.css  |    0
 .../wiki/src/tests/tutorial/templates/edit.pt      |   40 +-
 .../wiki/src/tests/tutorial/templates/login.pt     |   42 +-
 .../src/tests/tutorial/templates/mytemplate.pt     |   12 +-
 .../wiki/src/tests/tutorial/templates/view.pt      |   40 +-
 docs/tutorials/wiki/src/tests/tutorial/tests.py    |  217 +
 docs/tutorials/wiki/src/tests/tutorial/views.py    |  115 +
 docs/tutorials/wiki/src/views/CHANGES.txt          |    3 +
 docs/tutorials/wiki/src/views/MANIFEST.in          |    2 +
 docs/tutorials/wiki/src/views/README.txt           |    4 +
 .../tutorials/wiki/src/views/development.ini       |   12 +-
 .../tutorials/wiki/src/views/production.ini        |   12 +-
 docs/tutorials/wiki/src/views/setup.py             |   47 +
 docs/tutorials/wiki/src/views/tutorial/__init__.py |   18 +
 docs/tutorials/wiki/src/views/tutorial/models.py   |   22 +
 .../src/views/tutorial/static/pyramid-16x16.png    |  Bin 0 -> 1319 bytes
 .../wiki/src/views/tutorial/static/pyramid.png     |  Bin 0 -> 12901 bytes
 .../wiki/src/views/tutorial}/static/theme.css      |    8 +-
 .../wiki/src/views/tutorial}/static/theme.min.css  |    0
 .../wiki/src/views/tutorial/templates/edit.pt      |   37 +-
 .../src/views/tutorial/templates/mytemplate.pt     |   12 +-
 .../wiki/src/views/tutorial/templates/view.pt      |   37 +-
 docs/tutorials/wiki/src/views/tutorial/tests.py    |  126 +
 docs/tutorials/wiki/src/views/tutorial/views.py    |   60 +
 docs/tutorials/wiki/tests.rst                      |  103 +
 docs/tutorials/wiki2/authorization.rst             |  406 +
 docs/tutorials/wiki2/background.rst                |   20 +
 docs/tutorials/wiki2/basiclayout.rst               |  254 +
 docs/tutorials/wiki2/definingmodels.rst            |  127 +
 docs/tutorials/wiki2/definingviews.rst             |  369 +
 docs/tutorials/wiki2/design.rst                    |  150 +
 docs/tutorials/wiki2/distributing.rst              |   40 +
 docs/tutorials/wiki2/index.rst                     |   28 +
 docs/tutorials/wiki2/installation.rst              |  413 +
 docs/tutorials/wiki2/src/authorization/CHANGES.txt |    4 +
 docs/tutorials/wiki2/src/authorization/MANIFEST.in |    2 +
 docs/tutorials/wiki2/src/authorization/README.txt  |   14 +
 .../wiki2/src/authorization/development.ini        |   14 +-
 .../wiki2/src/authorization/production.ini         |   22 +-
 docs/tutorials/wiki2/src/authorization/setup.py    |   48 +
 .../wiki2/src/authorization/tutorial/__init__.py   |   37 +
 .../wiki2/src/authorization/tutorial/models.py     |   37 +
 .../src/authorization/tutorial/scripts/__init__.py |    1 +
 .../authorization/tutorial/scripts/initializedb.py |   37 +
 .../wiki2/src/authorization/tutorial/security.py   |    7 +
 .../tutorial/static/pyramid-16x16.png              |  Bin 0 -> 1319 bytes
 .../src/authorization/tutorial/static/pyramid.png  |  Bin 0 -> 12901 bytes
 .../src/authorization/tutorial}/static/theme.css   |    8 +-
 .../authorization/tutorial}/static/theme.min.css   |    0
 .../src/authorization/tutorial/templates/edit.pt   |   40 +-
 .../src/authorization/tutorial/templates/login.pt  |   42 +-
 .../authorization/tutorial/templates/mytemplate.pt |   12 +-
 .../src/authorization/tutorial/templates/view.pt   |   40 +-
 .../wiki2/src/authorization/tutorial/tests.py      |  146 +
 .../wiki2/src/authorization/tutorial/views.py      |  124 +
 docs/tutorials/wiki2/src/basiclayout/CHANGES.txt   |    4 +
 docs/tutorials/wiki2/src/basiclayout/MANIFEST.in   |    2 +
 docs/tutorials/wiki2/src/basiclayout/README.txt    |   14 +
 .../wiki2/src/basiclayout/development.ini          |   14 +-
 .../tutorials/wiki2/src/basiclayout/production.ini |   14 +-
 docs/tutorials/wiki2/src/basiclayout/setup.py      |   47 +
 .../wiki2/src/basiclayout/tutorial/__init__.py     |   21 +
 .../wiki2/src/basiclayout/tutorial/models.py       |   27 +
 .../src/basiclayout/tutorial/scripts/__init__.py   |    1 +
 .../basiclayout/tutorial/scripts/initializedb.py   |   37 +
 .../basiclayout/tutorial/static/pyramid-16x16.png  |  Bin 0 -> 1319 bytes
 .../src/basiclayout/tutorial/static/pyramid.png    |  Bin 0 -> 12901 bytes
 .../src/basiclayout/tutorial}/static/theme.css     |    8 +-
 .../src/basiclayout/tutorial}/static/theme.min.css |    0
 .../basiclayout/tutorial/templates/mytemplate.pt   |   12 +-
 .../wiki2/src/basiclayout/tutorial/tests.py        |   33 +
 .../wiki2/src/basiclayout/tutorial/views.py        |   35 +
 docs/tutorials/wiki2/src/models/CHANGES.txt        |    4 +
 docs/tutorials/wiki2/src/models/MANIFEST.in        |    2 +
 docs/tutorials/wiki2/src/models/README.txt         |   14 +
 .../tutorials/wiki2/src/models/development.ini     |   14 +-
 .../tutorials/wiki2/src/models/production.ini      |   22 +-
 docs/tutorials/wiki2/src/models/setup.py           |   47 +
 .../wiki2/src/models/tutorial/__init__.py          |   21 +
 docs/tutorials/wiki2/src/models/tutorial/models.py |   25 +
 .../wiki2/src/models/tutorial/scripts/__init__.py  |    1 +
 .../src/models/tutorial/scripts/initializedb.py    |   37 +
 .../src/models/tutorial/static/pyramid-16x16.png   |  Bin 0 -> 1319 bytes
 .../wiki2/src/models/tutorial/static/pyramid.png   |  Bin 0 -> 12901 bytes
 .../wiki2/src/models/tutorial}/static/theme.css    |    8 +-
 .../src/models/tutorial}/static/theme.min.css      |    0
 .../src/models/tutorial/templates/mytemplate.pt    |   12 +-
 docs/tutorials/wiki2/src/models/tutorial/tests.py  |   33 +
 docs/tutorials/wiki2/src/models/tutorial/views.py  |   35 +
 docs/tutorials/wiki2/src/tests/CHANGES.txt         |    4 +
 docs/tutorials/wiki2/src/tests/MANIFEST.in         |    2 +
 docs/tutorials/wiki2/src/tests/README.txt          |   14 +
 .../tutorials/wiki2/src/tests/development.ini      |   14 +-
 .../tutorials/wiki2/src/tests/production.ini       |   22 +-
 docs/tutorials/wiki2/src/tests/setup.py            |   49 +
 .../tutorials/wiki2/src/tests/tutorial/__init__.py |   37 +
 docs/tutorials/wiki2/src/tests/tutorial/models.py  |   37 +
 .../wiki2/src/tests/tutorial/scripts/__init__.py   |    1 +
 .../src/tests/tutorial/scripts/initializedb.py     |   37 +
 .../tutorials/wiki2/src/tests/tutorial/security.py |    7 +
 .../src/tests/tutorial/static/pyramid-16x16.png    |  Bin 0 -> 1319 bytes
 .../wiki2/src/tests/tutorial/static/pyramid.png    |  Bin 0 -> 12901 bytes
 .../wiki2/src/tests/tutorial}/static/theme.css     |    8 +-
 .../wiki2/src/tests/tutorial}/static/theme.min.css |    0
 .../wiki2/src/tests/tutorial/templates/edit.pt     |   42 +-
 .../wiki2/src/tests/tutorial/templates/login.pt    |   54 +
 .../src/tests/tutorial/templates/mytemplate.pt     |   12 +-
 .../wiki2/src/tests/tutorial/templates/view.pt     |   42 +-
 docs/tutorials/wiki2/src/tests/tutorial/tests.py   |  235 +
 docs/tutorials/wiki2/src/tests/tutorial/views.py   |  123 +
 docs/tutorials/wiki2/src/views/CHANGES.txt         |    4 +
 docs/tutorials/wiki2/src/views/MANIFEST.in         |    2 +
 docs/tutorials/wiki2/src/views/README.txt          |   14 +
 .../tutorials/wiki2/src/views/development.ini      |   14 +-
 .../tutorials/wiki2/src/views/production.ini       |   22 +-
 docs/tutorials/wiki2/src/views/setup.py            |   48 +
 .../tutorials/wiki2/src/views/tutorial/__init__.py |   24 +
 docs/tutorials/wiki2/src/views/tutorial/models.py  |   25 +
 .../wiki2/src/views/tutorial/scripts/__init__.py   |    1 +
 .../src/views/tutorial/scripts/initializedb.py     |   37 +
 .../src/views/tutorial/static/pyramid-16x16.png    |  Bin 0 -> 1319 bytes
 .../wiki2/src/views/tutorial/static/pyramid.png    |  Bin 0 -> 12901 bytes
 .../wiki2/src/views/tutorial}/static/theme.css     |    8 +-
 .../wiki2/src/views/tutorial/static/theme.min.css  |    1 +
 .../wiki2/src/views/tutorial/templates/edit.pt     |   37 +-
 .../src/views/tutorial/templates/mytemplate.pt     |   12 +-
 .../wiki2/src/views/tutorial/templates/view.pt     |   37 +-
 docs/tutorials/wiki2/src/views/tutorial/tests.py   |  146 +
 docs/tutorials/wiki2/src/views/tutorial/views.py   |   72 +
 docs/tutorials/wiki2/tests.rst                     |   97 +
 docs/whatsnew-1.0.rst                              |  579 ++
 docs/whatsnew-1.1.rst                              |  650 ++
 docs/whatsnew-1.2.rst                              |  310 +
 docs/whatsnew-1.3.rst                              |  574 ++
 docs/whatsnew-1.4.rst                              |  367 +
 docs/whatsnew-1.5.rst                              |  526 ++
 docs/whatsnew-1.6.rst                              |  236 +
 pyramid.egg-info/PKG-INFO                          | 1050 +--
 pyramid.egg-info/SOURCES.txt                       |  135 +-
 pyramid.egg-info/entry_points.txt                  |    2 +
 pyramid.egg-info/requires.txt                      |    5 +-
 pyramid/authentication.py                          |   38 +-
 pyramid/compat.py                                  |  110 +-
 pyramid/config/__init__.py                         |  145 +-
 pyramid/config/adapters.py                         |    2 +-
 pyramid/config/assets.py                           |  223 +-
 pyramid/config/factories.py                        |   52 +-
 pyramid/config/routes.py                           |   31 +-
 pyramid/config/settings.py                         |    9 +-
 pyramid/config/views.py                            |  280 +-
 pyramid/decorator.py                               |    8 +-
 pyramid/httpexceptions.py                          |   94 +-
 pyramid/i18n.py                                    |    8 +-
 pyramid/interfaces.py                              |  137 +-
 pyramid/path.py                                    |    3 +-
 pyramid/registry.py                                |   17 +
 pyramid/renderers.py                               |   88 +-
 pyramid/request.py                                 |   64 +-
 pyramid/response.py                                |   17 +-
 pyramid/router.py                                  |   44 +-
 pyramid/scaffolds/__init__.py                      |    4 -
 .../scaffolds/alchemy/+package+/static/theme.css   |    8 +-
 .../alchemy/+package+/static/theme.min.css         |    2 +-
 .../alchemy/+package+/templates/mytemplate.pt_tmpl |    1 +
 pyramid/scaffolds/alchemy/development.ini_tmpl     |    2 +-
 pyramid/scaffolds/alchemy/production.ini_tmpl      |    2 +-
 .../starter/+package+/templates/mytemplate.pt_tmpl |    1 +
 pyramid/scaffolds/starter/development.ini_tmpl     |    2 +-
 pyramid/scaffolds/starter/production.ini_tmpl      |    2 +-
 pyramid/scaffolds/tests.py                         |    4 +-
 .../zodb/+package+/templates/mytemplate.pt_tmpl    |    1 +
 pyramid/scaffolds/zodb/development.ini_tmpl        |    2 +-
 pyramid/scaffolds/zodb/production.ini_tmpl         |    2 +-
 pyramid/scripting.py                               |    8 +-
 pyramid/scripts/pcreate.py                         |  103 +-
 pyramid/scripts/prequest.py                        |   10 +-
 pyramid/scripts/proutes.py                         |   21 +-
 pyramid/scripts/pserve.py                          |  164 +-
 pyramid/scripts/pshell.py                          |  177 +-
 pyramid/scripts/pviews.py                          |   41 +-
 pyramid/security.py                                |   35 +-
 pyramid/session.py                                 |   24 +-
 pyramid/static.py                                  |  143 +-
 pyramid/testing.py                                 |   13 +-
 pyramid/tests/fixtures/manifest.json               |    4 +
 pyramid/tests/fixtures/manifest2.json              |    4 +
 pyramid/tests/test_authentication.py               |   75 +-
 pyramid/tests/test_compat.py                       |   26 +
 pyramid/tests/test_config/pkgs/asset/models.py     |    8 -
 .../pkgs/asset/subpackage/templates/bar.pt         |    0
 pyramid/tests/test_config/pkgs/asset/views.py      |   22 -
 pyramid/tests/test_config/test_adapters.py         |    2 +-
 pyramid/tests/test_config/test_assets.py           |  487 +-
 pyramid/tests/test_config/test_factories.py        |   34 +-
 pyramid/tests/test_config/test_init.py             |  110 +-
 pyramid/tests/test_config/test_settings.py         |   31 +-
 pyramid/tests/test_config/test_util.py             |    7 +
 pyramid/tests/test_config/test_views.py            |  431 +-
 pyramid/tests/test_decorator.py                    |   18 +-
 pyramid/tests/test_httpexceptions.py               |   17 +-
 pyramid/tests/test_integration.py                  |    2 +-
 pyramid/tests/test_path.py                         |    2 +-
 pyramid/tests/test_registry.py                     |   15 +
 pyramid/tests/test_renderers.py                    |  127 +-
 pyramid/tests/test_request.py                      |  153 +-
 pyramid/tests/test_response.py                     |   17 +-
 pyramid/tests/test_router.py                       |   22 +-
 pyramid/tests/test_scaffolds/test_init.py          |    5 -
 pyramid/tests/test_scripting.py                    |   16 +-
 pyramid/tests/test_scripts/dummy.py                |   43 +-
 pyramid/tests/test_scripts/pystartup.txt           |    3 +
 pyramid/tests/test_scripts/test_pcreate.py         |   72 +-
 pyramid/tests/test_scripts/test_prequest.py        |   13 +
 pyramid/tests/test_scripts/test_pserve.py          |    8 +-
 pyramid/tests/test_scripts/test_pshell.py          |  339 +-
 pyramid/tests/test_security.py                     |   21 +-
 pyramid/tests/test_session.py                      |   61 +-
 pyramid/tests/test_static.py                       |  120 +-
 pyramid/tests/test_testing.py                      |    6 +-
 pyramid/tests/test_traversal.py                    |    2 +-
 pyramid/tests/test_urldispatch.py                  |    2 +-
 pyramid/tests/test_util.py                         |  301 +-
 pyramid/tests/test_view.py                         |   23 +-
 pyramid/traversal.py                               |    2 +-
 pyramid/tweens.py                                  |   17 +-
 pyramid/urldispatch.py                             |    4 +-
 pyramid/util.py                                    |  151 +-
 pyramid/view.py                                    |  179 +-
 scaffoldtests.sh                                   |    3 +
 setup.cfg                                          |    2 -
 setup.py                                           |   11 +-
 tox.ini                                            |  107 +-
 712 files changed, 63685 insertions(+), 4088 deletions(-)

diff --cc debian/.git-dpm
index fad7309,0000000..6c81728
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- c7bd38b865aee709dfa4410a420a61a97c3bf763
- c7bd38b865aee709dfa4410a420a61a97c3bf763
- e356bfbd4749ea0bc4c5bb1af9b2ca1dfc4e06aa
++04197cf9c35adae86173ee636a7e98b60f6a950c
++04197cf9c35adae86173ee636a7e98b60f6a950c
++ff95ea8a7c662a038bf8b46101fc5298fd4768c2
 +ff95ea8a7c662a038bf8b46101fc5298fd4768c2
 +python-pyramid_1.6+dfsg.orig.tar.gz
 +b5dd130ddf9bd6594b11318f806bf60e4dbb8a0d
 +2567399
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/series
index 8b869a6,0000000..da632fa
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
 +tweak-requirements.patch
- getargspec-is-deprecated.patch
diff --cc debian/patches/tweak-requirements.patch
index 5dbe1fc,0000000..68edc28
mode 100644,000000..100644
--- a/debian/patches/tweak-requirements.patch
+++ b/debian/patches/tweak-requirements.patch
@@@ -1,36 -1,0 +1,36 @@@
- From 5207dc6e5001215d7c1963b9df52e4450b652b6c Mon Sep 17 00:00:00 2001
++From 04197cf9c35adae86173ee636a7e98b60f6a950c Mon Sep 17 00:00:00 2001
 +From: Barry Warsaw <barry at debian.org>
 +Date: Thu, 8 Oct 2015 12:48:00 -0700
 +Subject: Comment out some requirements that can't be satisfied
 +
 + automatically from installed packages or debian/py{,3}dist-override files.
 + It's okay because our Build-Depends will take care of it.
 +Forwarded: not-needed
 +
 +Patch-Name: tweak-requirements.patch
 +---
 + setup.py | 4 ++--
 + 1 file changed, 2 insertions(+), 2 deletions(-)
 +
 +diff --git a/setup.py b/setup.py
- index 6f7b79f..fecb338 100644
++index b162429..fe9f8ac 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -39,7 +39,7 @@ except IOError:
 + 
 + install_requires=[
 +     'setuptools',
 +-    'WebOb >= 1.3.1', # request.domain and CookieProfile
 ++    #'WebOb >= 1.3.1', # request.domain and CookieProfile
 +     'repoze.lru >= 0.4', # py3 compat
 +     'zope.interface >= 3.8.0',  # has zope.interface.registry
 +     'zope.deprecation >= 3.5.0', # py3 compat
 +@@ -49,7 +49,7 @@ install_requires=[
 +     ]
 + 
 + tests_require = [
 +-    'WebTest >= 1.3.1', # py3 compat
 ++    #'WebTest >= 1.3.1', # py3 compat
 +     ]
 + 
 + if not PY3:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-pyramid.git



More information about the Python-modules-commits mailing list