From c8b1ee29734db9171be236417cfdc409306919bc Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sat, 9 Jan 2021 04:01:40 -0800 Subject: Remove **kw. --- docs/tutorials/wiki2/src/authentication/tutorial/security.py | 8 ++++---- docs/tutorials/wiki2/src/authorization/tutorial/security.py | 8 ++++---- docs/tutorials/wiki2/src/tests/tutorial/security.py | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'docs/tutorials/wiki2') diff --git a/docs/tutorials/wiki2/src/authentication/tutorial/security.py b/docs/tutorials/wiki2/src/authentication/tutorial/security.py index e0d8ed965..e225c2ed6 100644 --- a/docs/tutorials/wiki2/src/authentication/tutorial/security.py +++ b/docs/tutorials/wiki2/src/authentication/tutorial/security.py @@ -27,11 +27,11 @@ class MySecurityPolicy: if user is not None: return user.id - def remember(self, request, userid, **kw): - return self.authtkt.remember(request, userid, **kw) + def remember(self, request, userid): + return self.authtkt.remember(request, userid) - def forget(self, request, **kw): - return self.authtkt.forget(request, **kw) + def forget(self, request): + return self.authtkt.forget(request) def includeme(config): settings = config.get_settings() diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/security.py b/docs/tutorials/wiki2/src/authorization/tutorial/security.py index 18f0bd4c7..c13285f77 100644 --- a/docs/tutorials/wiki2/src/authorization/tutorial/security.py +++ b/docs/tutorials/wiki2/src/authorization/tutorial/security.py @@ -33,11 +33,11 @@ class MySecurityPolicy: if user is not None: return user.id - def remember(self, request, userid, **kw): - return self.authtkt.remember(request, userid, **kw) + def remember(self, request, userid): + return self.authtkt.remember(request, userid) - def forget(self, request, **kw): - return self.authtkt.forget(request, **kw) + def forget(self, request): + return self.authtkt.forget(request) def permits(self, request, context, permission): principals = self.effective_principals(request) diff --git a/docs/tutorials/wiki2/src/tests/tutorial/security.py b/docs/tutorials/wiki2/src/tests/tutorial/security.py index 18f0bd4c7..c13285f77 100644 --- a/docs/tutorials/wiki2/src/tests/tutorial/security.py +++ b/docs/tutorials/wiki2/src/tests/tutorial/security.py @@ -33,11 +33,11 @@ class MySecurityPolicy: if user is not None: return user.id - def remember(self, request, userid, **kw): - return self.authtkt.remember(request, userid, **kw) + def remember(self, request, userid): + return self.authtkt.remember(request, userid) - def forget(self, request, **kw): - return self.authtkt.forget(request, **kw) + def forget(self, request): + return self.authtkt.forget(request) def permits(self, request, context, permission): principals = self.effective_principals(request) -- cgit v1.2.3 From 16d66c801d20010036d2d89e2f20e4156e19aa3e Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sat, 9 Jan 2021 04:31:55 -0800 Subject: Update outputs of running tests with coverage --- docs/tutorials/wiki2/installation.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'docs/tutorials/wiki2') diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst index 004f6ed31..c961d490b 100644 --- a/docs/tutorials/wiki2/installation.rst +++ b/docs/tutorials/wiki2/installation.rst @@ -338,15 +338,15 @@ If successful, you will see output something like this: .. code-block:: bash ======================== test session starts ======================== - platform -- Python 3.7.3, pytest-5.3.2, py-1.8.1, pluggy-0.13.1 + platform darwin -- Python 3.9.0, pytest-6.2.1, py-1.10.0, pluggy-0.13.1 rootdir: /tutorial, inifile: pytest.ini, testpaths: tutorial, tests - plugins: cov-2.8.1 + plugins: cov-2.10.1 collected 5 items - tests/test_functional.py .. - tests/test_views.py ... + tests/test_functional.py .. [ 40%] + tests/test_views.py ... [100%] - ---------- coverage: platform darwin, python 3.7.4-final-0 ----------- + ---------- coverage: platform darwin, python 3.9.0-final-0 ----------- Name Stmts Miss Cover Missing ---------------------------------------------------------------------------------- tutorial/__init__.py 8 0 100% @@ -360,10 +360,10 @@ If successful, you will see output something like this: tutorial/scripts/__init__.py 0 0 100% tutorial/scripts/initialize_db.py 22 14 36% 15-16, 20-25, 29-38 tutorial/views/__init__.py 0 0 100% - tutorial/views/default.py 12 0 100% - tutorial/views/notfound.py 4 0 100% + tutorial/views/default.py 13 0 100% + tutorial/views/notfound.py 5 0 100% ---------------------------------------------------------------------------------- - TOTAL 136 27 80% + TOTAL 138 27 80% ===================== 5 passed in 0.77 seconds ====================== -- cgit v1.2.3 From 485a4515fc22ed45327513e9b830e6ae08b7c495 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sun, 10 Jan 2021 01:02:30 -0800 Subject: grammar fix --- docs/tutorials/wiki2/authentication.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/tutorials/wiki2') diff --git a/docs/tutorials/wiki2/authentication.rst b/docs/tutorials/wiki2/authentication.rst index a798e7748..e8a770491 100644 --- a/docs/tutorials/wiki2/authentication.rst +++ b/docs/tutorials/wiki2/authentication.rst @@ -40,7 +40,7 @@ Update ``tutorial/security.py`` with the following content: :linenos: :language: python -Here we've defined a new security policy named ``MySecurityPolicy``, which is implementing most of the :class:`pyramid.interfaces.ISecurityPolicy` interface by tracking a :term:`identity` using a signed cookie implemented by :class:`pyramid.authentication.AuthTktCookieHelper` (lines 8-34). +Here we've defined a new security policy named ``MySecurityPolicy``, which is implementing most of the :class:`pyramid.interfaces.ISecurityPolicy` interface by tracking an :term:`identity` using a signed cookie implemented by :class:`pyramid.authentication.AuthTktCookieHelper` (lines 8-34). The security policy outputs the authenticated ``tutorial.models.User`` object for the logged-in user as the :term:`identity`, which is available as ``request.identity``. Our new :term:`security policy` defines how our application will remember, forget, and identify users. -- cgit v1.2.3 From b0dd658429367dd5e3cd99973bcc9a6763dcc5e7 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sun, 10 Jan 2021 01:12:09 -0800 Subject: Revert "Remove **kw." This reverts commit c8b1ee29 --- docs/tutorials/wiki2/src/authentication/tutorial/security.py | 8 ++++---- docs/tutorials/wiki2/src/authorization/tutorial/security.py | 8 ++++---- docs/tutorials/wiki2/src/tests/tutorial/security.py | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'docs/tutorials/wiki2') diff --git a/docs/tutorials/wiki2/src/authentication/tutorial/security.py b/docs/tutorials/wiki2/src/authentication/tutorial/security.py index e225c2ed6..e0d8ed965 100644 --- a/docs/tutorials/wiki2/src/authentication/tutorial/security.py +++ b/docs/tutorials/wiki2/src/authentication/tutorial/security.py @@ -27,11 +27,11 @@ class MySecurityPolicy: if user is not None: return user.id - def remember(self, request, userid): - return self.authtkt.remember(request, userid) + def remember(self, request, userid, **kw): + return self.authtkt.remember(request, userid, **kw) - def forget(self, request): - return self.authtkt.forget(request) + def forget(self, request, **kw): + return self.authtkt.forget(request, **kw) def includeme(config): settings = config.get_settings() diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/security.py b/docs/tutorials/wiki2/src/authorization/tutorial/security.py index c13285f77..18f0bd4c7 100644 --- a/docs/tutorials/wiki2/src/authorization/tutorial/security.py +++ b/docs/tutorials/wiki2/src/authorization/tutorial/security.py @@ -33,11 +33,11 @@ class MySecurityPolicy: if user is not None: return user.id - def remember(self, request, userid): - return self.authtkt.remember(request, userid) + def remember(self, request, userid, **kw): + return self.authtkt.remember(request, userid, **kw) - def forget(self, request): - return self.authtkt.forget(request) + def forget(self, request, **kw): + return self.authtkt.forget(request, **kw) def permits(self, request, context, permission): principals = self.effective_principals(request) diff --git a/docs/tutorials/wiki2/src/tests/tutorial/security.py b/docs/tutorials/wiki2/src/tests/tutorial/security.py index c13285f77..18f0bd4c7 100644 --- a/docs/tutorials/wiki2/src/tests/tutorial/security.py +++ b/docs/tutorials/wiki2/src/tests/tutorial/security.py @@ -33,11 +33,11 @@ class MySecurityPolicy: if user is not None: return user.id - def remember(self, request, userid): - return self.authtkt.remember(request, userid) + def remember(self, request, userid, **kw): + return self.authtkt.remember(request, userid, **kw) - def forget(self, request): - return self.authtkt.forget(request) + def forget(self, request, **kw): + return self.authtkt.forget(request, **kw) def permits(self, request, context, permission): principals = self.effective_principals(request) -- cgit v1.2.3