parent: f081ae | patch | commitdiff
Michael Merickel
2018-09-28 58d2a5f14bb787defefe7a2b1b36665c4991c0da
refs
author Michael Merickel <michael@merickel.org>
Friday, September 28, 2018 04:54 +0200
committer Michael Merickel <michael@merickel.org>
Friday, September 28, 2018 04:54 +0200
commit58d2a5f14bb787defefe7a2b1b36665c4991c0da
tree 3eff83e38ad641e7285ce6788cad47a12fa14262 tree | zip | gz
parent f081ae991a9107363fceeeeccd361c2f85bdd046 view | diff
279ee00fff1894b3451d84a8eeafae42e8638776 view | diff 
Merge branch 'master' into fix-deprecated-accept-predicate
5 files deleted
53 files added
116 files modified
2 files renamed
1949 ■■■■■ changed files
.travis.yml 4 ●●●●● diff | view | raw | blame | history
CHANGES.rst 28 ●●●●● diff | view | raw | blame | history
CONTRIBUTORS.txt 6 ●●●●● diff | view | raw | blame | history
COPYRIGHT.txt 2 ●●●●● diff | view | raw | blame | history
HACKING.txt 84 ●●●●● diff | view | raw | blame | history
docs/api/session.rst 8 ●●●●● diff | view | raw | blame | history
docs/conf.py 9 ●●●●● diff | view | raw | blame | history
docs/glossary.rst 6 ●●●●● diff | view | raw | blame | history
docs/index.rst 2 ●●●●● diff | view | raw | blame | history
docs/narr/commandline.rst 165 ●●●●● diff | view | raw | blame | history
docs/narr/introduction.rst 4 ●●●●● diff | view | raw | blame | history
docs/narr/myproject/.gitignore 21 ●●●●● diff | view | raw | blame | history
docs/narr/myproject/myproject/__init__.py 9 ●●●●● diff | view | raw | blame | history
docs/narr/myproject/myproject/routes.py 3 ●●●●● diff | view | raw | blame | history
docs/narr/myproject/myproject/templates/404.jinja2 8 ●●●●● diff | view | raw | blame | history
docs/narr/myproject/myproject/tests.py 2 ●●●●● diff | view | raw | blame | history
docs/narr/myproject/myproject/views.py 6 ●●●●● diff | view | raw | blame | history
docs/narr/myproject/myproject/views/__init__.py diff | view | raw | blame | history
docs/narr/myproject/myproject/views/default.py 6 ●●●●● diff | view | raw | blame | history
docs/narr/myproject/myproject/views/notfound.py 7 ●●●●● diff | view | raw | blame | history
docs/narr/myproject/setup.py 2 ●●●●● diff | view | raw | blame | history
docs/narr/project.rst 122 ●●●●● diff | view | raw | blame | history
docs/narr/sessions.rst 78 ●●●●● diff | view | raw | blame | history
docs/narr/testing.rst 4 ●●●●● diff | view | raw | blame | history
docs/pscripts/pcreate.rst 2 ●●●●● diff | view | raw | blame | history
docs/pscripts/pdistreport.rst 2 ●●●●● diff | view | raw | blame | history
docs/pscripts/prequest.rst 2 ●●●●● diff | view | raw | blame | history
docs/pscripts/proutes.rst 2 ●●●●● diff | view | raw | blame | history
docs/pscripts/pserve.rst 2 ●●●●● diff | view | raw | blame | history
docs/pscripts/pshell.rst 2 ●●●●● diff | view | raw | blame | history
docs/pscripts/ptweens.rst 2 ●●●●● diff | view | raw | blame | history
docs/pscripts/pviews.rst 2 ●●●●● diff | view | raw | blame | history
docs/quick_tour.rst 8 ●●●●● diff | view | raw | blame | history
docs/quick_tour/logging/.gitignore 21 ●●●●● diff | view | raw | blame | history
docs/quick_tour/logging/hello_world/__init__.py 9 ●●●●● diff | view | raw | blame | history
docs/quick_tour/logging/hello_world/routes.py 3 ●●●●● diff | view | raw | blame | history
docs/quick_tour/logging/hello_world/templates/404.jinja2 8 ●●●●● diff | view | raw | blame | history
docs/quick_tour/logging/hello_world/tests.py 2 ●●●●● diff | view | raw | blame | history
docs/quick_tour/logging/hello_world/views/__init__.py diff | view | raw | blame | history
docs/quick_tour/logging/hello_world/views/default.py 2 ●●●●● diff | view | raw | blame | history
docs/quick_tour/logging/hello_world/views/notfound.py 7 ●●●●● diff | view | raw | blame | history
docs/quick_tour/logging/setup.py 2 ●●●●● diff | view | raw | blame | history
docs/quick_tour/package/.gitignore 21 ●●●●● diff | view | raw | blame | history
docs/quick_tour/package/hello_world/__init__.py 9 ●●●●● diff | view | raw | blame | history
docs/quick_tour/package/hello_world/routes.py 3 ●●●●● diff | view | raw | blame | history
docs/quick_tour/package/hello_world/templates/404.jinja2 8 ●●●●● diff | view | raw | blame | history
docs/quick_tour/package/hello_world/tests.py 2 ●●●●● diff | view | raw | blame | history
docs/quick_tour/package/hello_world/views.py 6 ●●●●● diff | view | raw | blame | history
docs/quick_tour/package/hello_world/views/__init__.py diff | view | raw | blame | history
docs/quick_tour/package/hello_world/views/default.py 6 ●●●●● diff | view | raw | blame | history
docs/quick_tour/package/hello_world/views/notfound.py 7 ●●●●● diff | view | raw | blame | history
docs/quick_tour/package/setup.py 2 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sessions/.gitignore 21 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sessions/hello_world/__init__.py 13 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sessions/hello_world/routes.py 3 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sessions/hello_world/templates/404.jinja2 8 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sessions/hello_world/tests.py 2 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sessions/hello_world/views/__init__.py diff | view | raw | blame | history
docs/quick_tour/sessions/hello_world/views/default.py 2 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sessions/hello_world/views/notfound.py 7 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sessions/setup.py 2 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/.gitignore 21 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/README.txt 12 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/development.ini 11 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/production.ini 9 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/pytest.ini 2 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/setup.py 7 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/sqla_demo/__init__.py 10 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/sqla_demo/alembic/env.py 58 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/sqla_demo/alembic/script.py.mako 24 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/sqla_demo/alembic/versions/README.txt 1 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/sqla_demo/pshell.py 12 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/sqla_demo/scripts/initialize_db.py 48 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/sqla_demo/scripts/initializedb.py 45 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/sqla_demo/templates/mytemplate.jinja2 2 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/sqla_demo/views/default.py 11 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/cookiecutters/.gitignore 21 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/cookiecutters/cc_starter/__init__.py 9 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/cookiecutters/cc_starter/routes.py 3 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/cookiecutters/cc_starter/templates/404.jinja2 8 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/cookiecutters/cc_starter/tests.py 2 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/cookiecutters/cc_starter/views.py 6 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/cookiecutters/cc_starter/views/__init__.py diff | view | raw | blame | history
docs/quick_tutorial/cookiecutters/cc_starter/views/default.py 6 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/cookiecutters/cc_starter/views/notfound.py 7 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/cookiecutters/setup.py 5 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/package/setup.py 3 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/authorization.rst 6 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/.gitignore 21 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/README.txt 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/development.ini 3 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/production.ini 3 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/setup.py 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/pshell.py 11 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt 1 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt 1 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/.gitignore 21 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/development.ini 3 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/production.ini 3 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/setup.py 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/tutorial/pshell.py 11 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/installation/.gitignore 21 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/installation/development.ini 3 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/installation/production.ini 3 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/installation/setup.py 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/installation/tutorial/pshell.py 11 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/.gitignore 21 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/development.ini 3 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/production.ini 3 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/setup.py 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/tutorial/pshell.py 11 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/.gitignore 21 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/README.txt 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/development.ini 3 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/production.ini 3 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/setup.py 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/tutorial/pshell.py 11 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/tutorial/templates/edit.pt 1 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/tutorial/templates/mytemplate.pt 67 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/tutorial/templates/view.pt 1 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/.gitignore 21 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/README.txt 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/development.ini 3 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/production.ini 3 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/setup.py 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/pshell.py 11 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/basiclayout.rst 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/definingviews.rst 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authentication/development.ini 5 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authentication/production.ini 3 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authentication/setup.py 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authentication/tutorial/__init__.py 12 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authentication/tutorial/pshell.py 12 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authentication/tutorial/scripts/initialize_db.py 22 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/development.ini 5 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/production.ini 3 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/setup.py 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/__init__.py 12 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/pshell.py 12 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/scripts/initialize_db.py 22 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/development.ini 5 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/production.ini 3 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/setup.py 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py 10 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/pshell.py 12 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/scripts/initialize_db.py 26 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/development.ini 5 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/production.ini 3 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/setup.py 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/tutorial/__init__.py 10 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/tutorial/pshell.py 12 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/tutorial/scripts/initialize_db.py 26 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/development.ini 5 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/production.ini 3 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/setup.py 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/tutorial/__init__.py 10 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/tutorial/pshell.py 12 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/tutorial/scripts/initialize_db.py 22 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/development.ini 5 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/production.ini 3 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/setup.py 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/tutorial/__init__.py 12 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/tutorial/pshell.py 12 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/tutorial/scripts/initialize_db.py 22 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/development.ini 5 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/production.ini 3 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/setup.py 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/__init__.py 10 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/pshell.py 12 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/scripts/initialize_db.py 22 ●●●●● diff | view | raw | blame | history
pyramid/interfaces.py 8 ●●●●● diff | view | raw | blame | history
pyramid/renderers.py 10 ●●●●● diff | view | raw | blame | history
pyramid/security.py 4 ●●●●● diff | view | raw | blame | history
pyramid/session.py 59 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_renderers.py 14 ●●●●● diff | view | raw | blame | history
setup.py 4 ●●●●● diff | view | raw | blame | history