summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-09-08wordingChris McDonough
2013-09-08Merge branch 'bertjwregeer-feature/allow_dotted_predicates'Chris McDonough
2013-09-08Add feature update to CHANGES.txtBert JW Regeer
2013-09-08Remove useless spaces.Bert JW Regeer
2013-09-08Deprecate custom_predicates for add_view/add_routeBert JW Regeer
2013-09-08Update documentation to reflect the dotted python nameBert JW Regeer
2013-09-08Small change to allow predicates to be Python Dotted NamesBert JW Regeer
This allows a {view,route,subscriber} predicate factory to be named as a python dotted name that is then automatically resolved. Includes tests.
2013-09-08fix docs after removing bfg conversion chapter, add a prominent link to the ↵Chris McDonough
quick tour
2013-09-08remove bfg conversion chapterChris McDonough
2013-09-08Merge branch 'mmerickel-feature.rendering-doc-updates'Chris McDonough
2013-09-08fix merge conflictChris McDonough
2013-09-07- The ``pyramid.events.NewResponse`` event is now sent **after** responseChris McDonough
callbacks are executed. It previously executed before response callbacks were executed. Rationale: it's more useful to be able to inspect the response after response callbacks have done their jobs instead of before. Closes #1116.
2013-09-07single line importChris McDonough
2013-09-07unused importsChris McDonough
2013-09-07make the right assertions about this caseChris McDonough
2013-09-07add change notesChris McDonough
2013-09-07Merge branch 'bertjwregeer-feature/split_renderers_from_pyramid'Chris McDonough
2013-09-07Merge branch 'feature/split_renderers_from_pyramid' of ↵Chris McDonough
github.com:bertjwregeer/pyramid into bertjwregeer-feature/split_renderers_from_pyramid
2013-09-07Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-09-06Merge pull request #1112 from dhellmann/bug/namespace-packagesChris McDonough
Update package_name() to work with namespace pkgs
2013-09-06Merge pull request #1115 from bertjwregeer/docs/remove_init_sqlalchemyMichael Merickel
Docs: remove init sqlalchemy
2013-09-06Update line numbers as appropriateBert JW Regeer
Removing __init__ moved some code around, update the line numbers as appropriate so that the right sections of code get highlighted.
2013-09-06Add small note showing example usage of MyModelBert JW Regeer
2013-09-06removed MyModel.__init__ from the scaffoldssergey.volobuev
2013-09-06changed the explanation of the (now missing) __init__ methodsergey.volobuev
2013-09-06removed __init__ methods from SQLAlchemy models in the documentation because ↵sergey.volobuev
the latter generates a default constructor
2013-09-06Merge branch 'master' into feature/split_chameleon_from_pyramidBert JW Regeer
Merge in latest changes from master.
2013-09-06Remove un-used Dummies: DummyFactory/DummyRendererInfoBert JW Regeer
2013-09-06Add pragma: nocover due to Py3x/Py2x differencesBert JW Regeer
2013-09-06Remove _registerRenderer function from testsBert JW Regeer
It is no longer used, and thus wasn't covered.
2013-09-06Remove useless function that was used only for ChameleonBert JW Regeer
2013-09-06Add test to verify renders don't add response to RequestBert JW Regeer
We already added a test that verified that a renderer no longer mutated request.response, now we also have a test that verifies that if no response exists, then it won't be touched either.
2013-09-06Update package_name() to work with namespace pkgsDoug Hellmann
The logic in pyramid.path.package_name() should take into account the fact that namespace packages created by setuptools do not have __init__.py[c] files, and so they have no __file__ attribute. This resolves an issue with WSME (https://bugs.launchpad.net/wsme/+bug/1221201) Change-Id: I39bc32a9c38fa11c4cef22a041077ed9001091be
2013-09-06apostropheMichael Merickel
2013-09-06update scaffolds to require pyramid_chameleonMichael Merickel
2013-09-06fix some more broken referencesMichael Merickel
2013-09-06update the code in the wiki and wiki2 tutorials to use pyramid_chameleonMichael Merickel
2013-09-05Fix tests on Python 3.xBert JW Regeer
2013-09-05Fix DummyRequest so that response is created each timeBert JW Regeer
Due to only creating the DummyRequest once various mutations were bleeding across various different tests. With hilarious results.
2013-09-05remove chameleon refs from asset specsMichael Merickel
2013-09-05update the MyProject example app to use pyramid_chameleonMichael Merickel
2013-09-06Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-09-06shorten test output in travisChris McDonough
2013-09-05remove some more mako/chameleon referencesMichael Merickel
2013-09-05Merge branch 'master' into feature/split_chameleon_from_pyramidBert JW Regeer
Conflicts: pyramid/tests/test_renderers.py
2013-09-05s/view execution machinery/generating a response/Michael Merickel
2013-09-05Remove unnecessary try/finallyBert JW Regeer
2013-09-05Re-enable two tests using JSON renderer instead of ChameleonBert JW Regeer
2013-09-05resolve conflicts, reword change entry a bitChris McDonough
2013-09-05move templating bindings back into the templating chapterMichael Merickel