From 9c01c2f246ea87b3275b80b97b2277a3f9078db8 Mon Sep 17 00:00:00 2001 From: Gil Forcada Codinachs Date: Wed, 8 Feb 2023 18:03:25 +0100 Subject: [PATCH] chore: pyupgrade --- borg/__init__.py | 9 +-------- borg/localrole/__init__.py | 1 - borg/localrole/bbb/__init__.py | 1 - borg/localrole/bbb/interfaces.py | 1 - borg/localrole/config.py | 1 - borg/localrole/default_adapter.py | 5 ++--- borg/localrole/factory_adapter.py | 3 +-- borg/localrole/interfaces.py | 1 - borg/localrole/setuphandlers.py | 1 - borg/localrole/tests.py | 7 +++---- borg/localrole/utils.py | 4 +--- borg/localrole/workspace.py | 3 +-- setup.py | 1 - 13 files changed, 9 insertions(+), 29 deletions(-) diff --git a/borg/__init__.py b/borg/__init__.py index ab2575f..de40ea7 100644 --- a/borg/__init__.py +++ b/borg/__init__.py @@ -1,8 +1 @@ -# -*- coding: utf-8 -*- -# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages -try: - __import__('pkg_resources').declare_namespace(__name__) -except ImportError: - from pkgutil import extend_path - __path__ = locals()['__path__'] # make pyflakes happy... - __path__ = extend_path(__path__, __name__) +__import__('pkg_resources').declare_namespace(__name__) diff --git a/borg/localrole/__init__.py b/borg/localrole/__init__.py index 70aa109..fb97253 100644 --- a/borg/localrole/__init__.py +++ b/borg/localrole/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from AccessControl.Permissions import add_user_folders from borg.localrole import workspace from Products.PluggableAuthService import registerMultiPlugin diff --git a/borg/localrole/bbb/__init__.py b/borg/localrole/bbb/__init__.py index 40a96af..e69de29 100644 --- a/borg/localrole/bbb/__init__.py +++ b/borg/localrole/bbb/__init__.py @@ -1 +0,0 @@ -# -*- coding: utf-8 -*- diff --git a/borg/localrole/bbb/interfaces.py b/borg/localrole/bbb/interfaces.py index 94969aa..95bd9b9 100644 --- a/borg/localrole/bbb/interfaces.py +++ b/borg/localrole/bbb/interfaces.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from zope.interface import Interface diff --git a/borg/localrole/config.py b/borg/localrole/config.py index 994dd88..1bb272e 100644 --- a/borg/localrole/config.py +++ b/borg/localrole/config.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Configuration constants LOCALROLE_PLUGIN_NAME = 'borg_localroles' diff --git a/borg/localrole/default_adapter.py b/borg/localrole/default_adapter.py index 1ab7847..04b9874 100644 --- a/borg/localrole/default_adapter.py +++ b/borg/localrole/default_adapter.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from borg.localrole.interfaces import ILocalRoleProvider from zope.component import adapter from zope.interface import implementer @@ -9,7 +8,7 @@ @implementer(ILocalRoleProvider) @adapter(Interface) -class DefaultLocalRoleAdapter(object): +class DefaultLocalRoleAdapter: """Looks at __ac_local_roles__ to find local roles stored persistently on an object:: @@ -77,4 +76,4 @@ def getRoles(self, principal_id): def getAllRoles(self): """Returns all the local roles assigned in this context: (principal_id, [role1, role2])""" - return six.iteritems(self._rolemap) + return self._rolemap.items() diff --git a/borg/localrole/factory_adapter.py b/borg/localrole/factory_adapter.py index da0c66b..ddb0608 100644 --- a/borg/localrole/factory_adapter.py +++ b/borg/localrole/factory_adapter.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from Acquisition import aq_inner from Acquisition import aq_parent from borg.localrole.interfaces import IFactoryTempFolder @@ -10,7 +9,7 @@ @implementer(ILocalRoleProvider) @adapter(IFactoryTempFolder) -class FactoryTempFolderProvider(object): +class FactoryTempFolderProvider: """A simple local role provider which just gathers the roles from the desired context:: diff --git a/borg/localrole/interfaces.py b/borg/localrole/interfaces.py index 9bd2f2e..42b729f 100644 --- a/borg/localrole/interfaces.py +++ b/borg/localrole/interfaces.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from zope.deferredimport import deprecated from zope.interface import Interface diff --git a/borg/localrole/setuphandlers.py b/borg/localrole/setuphandlers.py index 05e3089..bd29f33 100644 --- a/borg/localrole/setuphandlers.py +++ b/borg/localrole/setuphandlers.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from borg.localrole.utils import setup_localrole_plugin diff --git a/borg/localrole/tests.py b/borg/localrole/tests.py index b659583..ad91721 100644 --- a/borg/localrole/tests.py +++ b/borg/localrole/tests.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from borg.localrole import default_adapter from borg.localrole import factory_adapter from plone.app.testing import PLONE_INTEGRATION_TESTING @@ -14,7 +13,7 @@ @implementer(borg.localrole.interfaces.ILocalRoleProvider) -class SimpleLocalRoleProvider(object): +class SimpleLocalRoleProvider: def __init__(self, context): self.context = context @@ -29,7 +28,7 @@ def getAllRoles(self): yield ('bogus_user', ('Foo', )) -class DummyUser(object): +class DummyUser: def __init__(self, uid, group_ids=()): self.id = uid self._groups = group_ids @@ -50,7 +49,7 @@ def getRoles(self): class Py23DocChecker(doctest.OutputChecker): def check_output(self, want, got, optionflags): if six.PY2: - got = re.sub("set\(\[(.*?)\]\)", "{\\1}", got) + got = re.sub(r"set\(\[(.*?)\]\)", "{\\1}", got) want = re.sub( 'plone.memoize.volatile.DontCache', 'DontCache', want diff --git a/borg/localrole/utils.py b/borg/localrole/utils.py index d69854e..ed5bed4 100644 --- a/borg/localrole/utils.py +++ b/borg/localrole/utils.py @@ -1,12 +1,10 @@ -# -*- coding: utf-8 -*- -from __future__ import print_function from Acquisition import aq_base from borg.localrole.config import LOCALROLE_PLUGIN_NAME from borg.localrole.workspace import manage_addWorkspaceLocalRoleManager from Products.CMFCore.utils import getToolByName from Products.PlonePAS.plugins.local_role import LocalRolesManager from Products.PlonePAS.setuphandlers import activatePluginInterfaces -from six import StringIO +from io import StringIO def setup_localrole_plugin(portal): diff --git a/borg/localrole/workspace.py b/borg/localrole/workspace.py index 91247bb..1f8c82d 100644 --- a/borg/localrole/workspace.py +++ b/borg/localrole/workspace.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from AccessControl import ClassSecurityInfo from Acquisition import aq_get from Acquisition import aq_inner @@ -39,7 +38,7 @@ def manage_addWorkspaceLocalRoleManager( if REQUEST is not None: REQUEST.RESPONSE.redirect( - '{0}/manage_workspace?' + '{}/manage_workspace?' 'manage_tabs_message=WorkspaceLocalRoleManager+added.'.format( dispatcher.absolute_url() ) diff --git a/setup.py b/setup.py index a1614c3..26a4d9e 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from setuptools import find_packages from setuptools import setup