summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt3
-rw-r--r--pyramid/interfaces.py4
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``.