diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 26c3c6f..1890310 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -16,7 +16,7 @@ repos: hooks: - id: isort - repo: https://github.com/psf/black-pre-commit-mirror - rev: 25.12.0 + rev: 26.1.0 hooks: - id: black - repo: https://github.com/collective/zpretty diff --git a/setup.py b/setup.py index 9930c84..a7c4581 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,5 @@ from setuptools import setup - version = "5.0.0a2.dev0" longdescription = open("README.rst").read() longdescription += "\n" diff --git a/src/plone/session/__init__.py b/src/plone/session/__init__.py index 5620c43..0d0f75d 100644 --- a/src/plone/session/__init__.py +++ b/src/plone/session/__init__.py @@ -2,7 +2,6 @@ from plone.session.plugins import session from Products.PluggableAuthService.PluggableAuthService import registerMultiPlugin - registerMultiPlugin(session.SessionPlugin.meta_type) diff --git a/src/plone/session/plugins/session.py b/src/plone/session/plugins/session.py index f05787d..fc9626e 100644 --- a/src/plone/session/plugins/session.py +++ b/src/plone/session/plugins/session.py @@ -21,7 +21,6 @@ import binascii import time - EMPTY_GIF = ( "GIF89a\x01\x00\x01\x00\xf0\x01\x00\xff\xff\xff" "\x00\x00\x00!\xf9\x04\x01\n\x00\x00\x00" @@ -217,7 +216,7 @@ def authenticateCredentials(self, credentials): ticket_data = self._validateTicket(ticket) if ticket_data is None: return None - (digest, userid, tokens, user_data, timestamp) = ticket_data + digest, userid, tokens, user_data, timestamp = ticket_data pas = self._getPAS() info = pas._verifyUser(pas.plugins, user_id=userid) if info is None: @@ -413,7 +412,7 @@ def _refreshSession(self, request, now=None): ticket_data = self._validateTicket(ticket, now) if ticket_data is None: return None - (digest, userid, tokens, user_data, timestamp) = ticket_data + digest, userid, tokens, user_data, timestamp = ticket_data self._setupSession(userid, request.response, tokens, user_data) return True diff --git a/src/plone/session/testing.py b/src/plone/session/testing.py index ee506a2..6625a5c 100644 --- a/src/plone/session/testing.py +++ b/src/plone/session/testing.py @@ -10,7 +10,6 @@ import doctest - folder_name = "test_folder_1_" user_name = "test_user_1_" user_password = "secret" diff --git a/src/plone/session/tests/testDocTests.py b/src/plone/session/tests/testDocTests.py index 5c6cf5b..7d4c7dc 100644 --- a/src/plone/session/tests/testDocTests.py +++ b/src/plone/session/tests/testDocTests.py @@ -3,7 +3,6 @@ import doctest import unittest - optionflags = doctest.ELLIPSIS diff --git a/src/plone/session/tktauth.py b/src/plone/session/tktauth.py index 0637c09..1e970d7 100755 --- a/src/plone/session/tktauth.py +++ b/src/plone/session/tktauth.py @@ -265,7 +265,7 @@ def validateTicket( secret, ticket, ip="0.0.0.0", timeout=0, now=None, encoding=None, mod_auth_tkt=False ): try: - (digest, userid, tokens, user_data, timestamp) = data = splitTicket(ticket) + digest, userid, tokens, user_data, timestamp = data = splitTicket(ticket) except ValueError: return None new_ticket = createTicket(