diff options
| author | Chris McDonough <chrism@plope.com> | 2011-01-03 00:01:03 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-01-03 00:01:03 -0500 |
| commit | 07ee47bd416ef0c7db6b42fe3c13e37a15ca48d3 (patch) | |
| tree | 39d03adeb9d3604bba3fb6fdcaea0cdea78c33ae | |
| parent | af9935209396d741ca6ec90c82b0a984e1d3b27f (diff) | |
| parent | ac718c77c3d2b90c87f4f0b369eedff5884a2326 (diff) | |
| download | pyramid-07ee47bd416ef0c7db6b42fe3c13e37a15ca48d3.tar.gz pyramid-07ee47bd416ef0c7db6b42fe3c13e37a15ca48d3.tar.bz2 pyramid-07ee47bd416ef0c7db6b42fe3c13e37a15ca48d3.zip | |
Merge branch 'jkrebs-master'
Conflicts:
CHANGES.txt
| -rw-r--r-- | CHANGES.txt | 3 | ||||
| -rw-r--r-- | pyramid/interfaces.py | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index ec631cc78..6471dd7a8 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -9,6 +9,9 @@ Bug Fixes Instead of trying to resolve the view, if it cannot, it will now just print ``<unknown>``. +- The `self` argument was included in new methods of the ``ISession`` interface + signature, causing ``pyramid_beaker`` tests to fail (jkrebs). + Features -------- diff --git a/pyramid/interfaces.py b/pyramid/interfaces.py index 0a6b39de4..b109df77e 100644 --- a/pyramid/interfaces.py +++ b/pyramid/interfaces.py @@ -512,11 +512,11 @@ class ISession(Interface): :meth:`pyramid.interfaces.ISesssion.flash` """ - def new_csrf_token(self): + def new_csrf_token(): """ Create and set into the session a new, random cross-site request forgery protection token. Return the token. It will be a string.""" - def get_csrf_token(self): + def get_csrf_token(): """ Get the CSRF token previously added to the session via ``new_csrf_token``, and return the token. If no CSRF token exists, the value returned will be ``None``. |