summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-07-29Use None for the default value of the callbacks list.Dobes Vandermeer
2014-07-23Add a test case for a response callback adding a response callback when it ↵Dobes Vandermeer
is the only callback.
2014-07-09Allow the last callback called to add a callbackdobesv
This fixes a bug in the finished and response callbacks where if the last/only callback adds another callback, the newly added callback won't be called afterwards. This is because when it tries to add the callback, it is added to a new list instance because the callbacks list is empty at that time; the check for whether the callbacks list was created didn't previously distinguish between an empty list and not a list. However, if it is not the last callback in the list, the callbacks list will not be empty and the new callback will be added to the same list and the newly added callback *will* be called. Because the code as written appears to be trying to support callbacks adding callbacks, this push request modifies the code so that a callback may add another callback whether it is the last one or not. An alternative approach would be to modify the code so that callbacks cannot add new callbacks, which also would be reasonable. But I think it's a bug that the behavior depends currently on whether you are in the last/only callback when you try to add another one.
2014-07-04Fix path to pshellKamal Gill
2014-07-04Correct handler name for logger_wsgiLiJunjie
2014-07-02dont need to use any settings, we include pyramid_jinja2 in mainChris McDonough
2014-07-01Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2014-06-20Merge pull request #1365 from frewsxcv/patch-1Tres Seaver
Enable automated testing with Python 3.4
2014-06-19Enable automated testing with Python 3.4Corey Farwell
2014-06-05- Work around a bug introduced in Python 2.7.7 on Windows whereChris McDonough
``mimetypes.guess_type`` returns Unicode rather than str for the content type, unlike any previous version of Python. See https://github.com/Pylons/pyramid/issues/1360 for more information. Closes #1360.
2014-06-05Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2014-06-04Merge pull request #1359 from george2/patch-1Michael Merickel
Scaffold templates: fix missing </ul> tags
2014-06-04Scaffold templates: close more ul tags.george
Missing tags in other scaffold templates.
2014-06-04Scaffold template: close an ul tag.george2
Missing `</ul>` in starter scaffold template.
2014-06-01fix inclusion of README.rst in the package descriptiongoodwillcoding
2014-05-25Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2014-05-25Bring in #1352Steve Piercy
2014-05-22fix project urlMichael Merickel
2014-05-21oops, re-clarify that tweens should not have mutable stateMichael Merickel
2014-05-21Merge branch 'pull.1349'Michael Merickel
2014-05-21clarify tween thread-safetyMichael Merickel
2014-05-18Draw attention that tweens instances are unique and shared between threadsflibustenet
Forgetting that tween instance are not instantiated for each request leads to threads issues difficult to detect
2014-05-16update changelogMichael Merickel
2014-05-16Merge branch 'pull.1251'Michael Merickel
2014-05-16close resources and 80-char line widthMichael Merickel
2014-05-16Expand tests - make sure pdf, jpeg types also are not annotated with a charset.Dobes Vandermeer
2014-05-16Add tests for the content_type fix.Dobes Vandermeer
2014-05-16Don't incorrectly default charset on FileResponsedobesv
By passing the content_type into the constructor to Response, we can allow it to decide intelligently whether the default charset should apply. Otherwise we'd have to replicate that logic somehow, or live with weird charset annotations on images, pdfs, and zips.
2014-05-16Merge pull request #1346 from kpinc/doc_templatesMichael Merickel
Docs: narr/templates.rst: Link template bindings to pyramid docs.
2014-05-16Docs: narr/templates.rst: Link template bindings to pyramid docs.Karl O. Pinc
2014-05-16Merge pull request #1347 from krysros/masterSteve Piercy
fix typo
2014-05-16fix typokrysros
2014-05-16Merge pull request #1345 from kpinc/doc_templatesMichael Merickel
Docs: narr/templates.rst: Doc default extensions of each template system...
2014-05-16Docs: narr/templates.rst: Doc default extensions of each template system.Karl O. Pinc
2014-05-13Merge pull request #1341 from bertjwregeer/fix.typoMichael Merickel
Update hooks.rst
2014-05-13Update hooks.rstsynthomat
'self' param was omitted in the constructor of simple_tween_factory class
2014-05-12Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2014-05-07Merge branch 'master' of https://github.com/ftravers/pyramid into pull.1325Michael Merickel
2014-05-06Added required notes to changes/contributors file.Fenton Travers
2014-05-05Merge pull request #1322 from Pylons/fix.setUp-relative-packageMichael Merickel
modify p.testing.setUp() to configure the package relative to caller
2014-05-05modify p.testing.setUp() to configure the package relative to callerMichael Merickel
2014-05-05Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2014-05-05fix merge conflictsChris McDonough
2014-05-05Merge pull request #1335 from flibustenet/patch-3Michael Merickel
Order of response_callback in the docstring
2014-05-05modify changes wrt logging config strippingChris McDonough
2014-05-05Merge branch 'redundant_totuorial_logging_config'Chris McDonough
2014-05-05Merge branch 'master' into redundant_totuorial_logging_configChris McDonough
2014-05-05Order of response_callback in the docstringflibustenet
2014-05-03Merge pull request #1333 from stevepiercy/masterSteve Piercy
- add a reference
2014-05-03- add a referenceSteve Piercy