summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-05-05added note about constructor argument for same purpose, for uniformitycguardia
2011-05-05removed meth indicator, which caused parentheses to show beside the name of ↵cguardia
the argument
2011-05-05removed meth indicator, which was showing on the rendered docscguardia
2011-05-05Merge pull request #184 from mmerickel/fix_auth_tutorialCarlos de la Guardia
Fix auth tutorial docs/code
2011-05-05Fixed some line numbers in the docs.Michael Merickel
2011-05-05Fixed a bug in the wiki2/auth tutorial.Michael Merickel
2011-05-04note pviewsChris McDonough
2011-05-04Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2011-05-04Merge pull request #182 from cguardia/masterChris McDonough
Merge paster pviews command from cguardia's master
2011-05-04Merge pull request #181 from dairiki/masterCarlos de la Guardia
Minor documentation typo
2011-05-04changed __doc__ to __text__ in dummy custom predicatecguardia
2011-05-04Revert "test adding theme as a submodule"cguardia
This reverts commit 94c2dc0bae9cf14cc6a5548119933e4477d07042.
2011-05-04Revert "fixed makefile to update theme submodule correctly"cguardia
This reverts commit f2d5cb59deba682d7c1d461ab5e90ba1802d42ac.
2011-05-04Revert "added requirement file to test rtd integration"cguardia
This reverts commit 9c0b0adf505444831704879a00f299ad74837284.
2011-05-04Revert "changed requirements file to test rtd integration"cguardia
This reverts commit 5d150878d489ee90737f3a35e609adbb55de53c3.
2011-05-04Merge branch 'master' of https://github.com/Pylons/pyramidcguardia
2011-05-04code refactoring for showing route->view relationship more correctly; tests ↵cguardia
and docs for pull request
2011-05-04Documentation typo fixGeoffrey T. Dairiki
2011-04-27- Passing an ``environ`` dictionary to the ``__call__`` method of aChris McDonough
"traverser" (e.g. an object that implements ``pyramid.interfaces.ITraverser`` such as an instance of ``pyramid.traversal.ResourceTreeTraverser``) as its ``request`` argument now causes a deprecation warning to be emitted. Consumer code should pass a ``request`` object instead. The fact that passing an environ dict is permitted has been documentation-deprecated since ``repoze.bfg`` 1.1, and this capability will be removed entirely in a future version. - The following (undocumented, dictionary-like) methods of the ``pyramid.request.Request`` object have been deprecated: ``__contains__``, ``__delitem__``, ``__getitem__``, ``__iter__``, ``__setitem__``, ``get``, ``has_key``, ``items``, ``iteritems``, ``itervalues``, ``keys``, ``pop``, ``popitem``, ``setdefault``, ``update``, and ``values``. Usage of any of these methods will cause a deprecation warning to be emitted. These methods were added for internal compatibility in ``repoze.bfg`` 1.1 (code that currently expects a request object expected an environ object in BFG 1.0 and before). In a future version, these methods will be removed entirely.
2011-04-27- Previously, ``pyramid.request.Request`` inherited fromChris McDonough
``webob.request.Request`` and implemented ``__getattr__``, ``__setattr__`` and ``__delattr__`` itself in order to overidde "adhoc attr" WebOb behavior where attributes of the request are stored in the environ. Now, ``pyramid.request.Request`` object inherits from (the more recent) ``webob.request.BaseRequest`` instead of ``webob.request.Request``, which provides the same behavior. ``pyramid.request.Request`` no longer implements its own ``__getattr__``, ``__setattr__`` or ``__delattr__`` as a result.
2011-04-27pulled in mcdoncs changescguardia
2011-04-27Merge branch 'cguardia-master' into pviewsChris McDonough
2011-04-27use __doc__ instead of __text__ to represent predicate output; inject ↵Chris McDonough
bfg.routes.matchdict into environ to prevent return of wrong subpath; expose __predicates__ as actual predicates rather than text for ease of copying (although i dont like it)
2011-04-27removed line that will never be executedcguardia
2011-04-27use __doc__ instead of __text__ for predicate descriptioncguardia
2011-04-27Merge branch 'master' of https://github.com/Pylons/pyramidcguardia
2011-04-25Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2011-04-25spell it out entirelyChris McDonough
2011-04-25added to contibutor listcguardia
2011-04-25Merge branch 'master' of https://github.com/Pylons/pyramidcguardia
2011-04-25revert a5702cd8: oops, it undoes timing attack protectionPhilip Jenvey
2011-04-24refactorPhilip Jenvey
2011-04-24resistance is futile, assimilating (not built by aliens)Philip Jenvey
2011-04-25Merge branch 'master' of https://github.com/Pylons/pyramidcguardia
2011-04-24finished paster views command and 100% test coveragecguardia
2011-04-24Merge branch 'ppaez-zodb-tutorial-test-reorg'Chris McDonough
2011-04-24Merge branch 'zodb-tutorial-test-reorg' of https://github.com/ppaez/pyramid ↵Chris McDonough
into ppaez-zodb-tutorial-test-reorg
2011-04-24Merge branch 'jdnavarro-master'Chris McDonough
2011-04-24Merge branch 'master' of https://github.com/jdnavarro/pyramid into ↵Chris McDonough
jdnavarro-master
2011-04-24fix rendering issueChris McDonough
2011-04-23BFG -> PyramidDanny Navarro
2011-04-22Merge branch 'kstrauser-master'Chris McDonough
2011-04-22fix merge conflictsChris McDonough
2011-04-22reference an issueChris McDonough
2011-04-22test coverageChris McDonough
2011-04-22Merge branch 'mmerickel-disambiguate_add_route'Chris McDonough
2011-04-22- Make sure deprecation warnings aren't raised when tests are run.Chris McDonough
- Modify documentation for cross-referencing. - Use add_view(viewname) syntax rather than add_view(view=viewname) syntax for normalization. - Use warnings.warn rather than zope.deprecated in order to make testing easier. - Move tests which test deprecated methods of configurator to a separate test case.
2011-04-22Merge branch 'disambiguate_add_route' of ↵Chris McDonough
https://github.com/mmerickel/pyramid into mmerickel-disambiguate_add_route
2011-04-22Updated static tests to pass using the add_route deprecations.Michael Merickel
2011-04-22version bumpChris McDonough