Merge pull request #31 from plone/small-fixes

Small fixes

news/26.feature.txt → news/26.feature

@@ -1 +1 @@
-Creating per-user keyrings in order to have session invalidation on log-out (server-side logout). [david-batranu]
+Creating per-user keyrings in order to have session invalidation on log-out (server-side logout). [david-batranu]

plone/session/__init__.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 from AccessControl.Permissions import add_user_folders
 from plone.session.plugins import session
-from Products.PluggableAuthService.PluggableAuthService import \
-    registerMultiPlugin
+from Products.PluggableAuthService.PluggableAuthService import registerMultiPlugin
+
 
 registerMultiPlugin(session.SessionPlugin.meta_type)
 

plone/session/hiddenprofiles.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-from zope.interface import implementer
 from Products.CMFPlone.interfaces import INonInstallable
+from zope.interface import implementer
 
 
 @implementer(INonInstallable)

plone/session/plugins/session.py

@@ -9,20 +9,26 @@
 from plone.session import tktauth
 from plone.session.interfaces import ISessionPlugin
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
-from Products.PluggableAuthService.interfaces.plugins import IAuthenticationPlugin  # noqa
-from Products.PluggableAuthService.interfaces.plugins import ICredentialsResetPlugin  # noqa
-from Products.PluggableAuthService.interfaces.plugins import ICredentialsUpdatePlugin  # noqa
+from Products.PluggableAuthService.interfaces.plugins import (
+    IAuthenticationPlugin,
+)
+from Products.PluggableAuthService.interfaces.plugins import (
+    ICredentialsResetPlugin,
+)
+from Products.PluggableAuthService.interfaces.plugins import (
+    ICredentialsUpdatePlugin,
+)
 from Products.PluggableAuthService.interfaces.plugins import IExtractionPlugin
 from Products.PluggableAuthService.permissions import ManageUsers
 from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
 from zope.component import getUtility
 from zope.component import queryUtility
 from zope.interface import implementer
-from zope.interface import alsoProvides
 
 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'

plone/session/tests/testDocTests.py

@@ -1,10 +1,11 @@
 # coding=utf-8
+from plone.session import tktauth
+
 import doctest
-import unittest
-import six
 import re
+import six
+import unittest
 
-from plone.session import tktauth
 
 optionflags = doctest.ELLIPSIS
 

plone/session/tests/testPAS.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 from DateTime import DateTime
 from plone.app.testing import logout
-from zope.publisher.browser import TestRequest
 from plone.session.interfaces import ISessionPlugin
 from plone.session.testing import PLONE_SEESION_FUNCTIONAL_TESTING
+from zope.publisher.browser import TestRequest
 
 import base64
 import six
@@ -208,4 +208,4 @@ def testCookieValidAfterLogout(self):
 
         creds = session.extractCredentials(request)
         auth = session._validateTicket(creds["cookie"])
-        self.assertIsNotNone(auth)
+        self.assertIsNotNone(auth)

plone/session/tktauth.py

@@ -133,7 +133,7 @@
   >>> data is not None
   True
 
-"""
+"""  # noqa: E501
 
 from socket import inet_aton
 from struct import pack
@@ -153,6 +153,7 @@ def safe_encode(value, encoding='utf-8'):
         value = value.encode(encoding)
     return value
 
+
 def safe_text(value, encoding='utf-8'):
     """Converts a value to text, even it is already a text string.
 
@@ -177,6 +178,7 @@ def safe_text(value, encoding='utf-8'):
             value = value.decode('utf-8', 'replace')
     return value
 
+
 def is_equal(val1, val2):
     # constant time comparison
     if not isinstance(val1, six.binary_type) or \
@@ -300,8 +302,9 @@ def validateTicket(secret, ticket, ip='0.0.0.0', timeout=0, now=None,
 
 # doctest runner
 def _test():
-    import doctest
     from plone.session.tests.testDocTests import Py23DocChecker
+
+    import doctest
     doctest.testmod(
         optionflags=doctest.ELLIPSIS + doctest.NORMALIZE_WHITESPACE,
         checker=Py23DocChecker(),

setup.cfg

@@ -1,2 +1,11 @@
 [bdist_wheel]
 universal = 0
+
+[flake8]
+max-line-length = 88
+
+[isort]
+profile = black
+force_alphabetical_sort=True
+force_single_line=True
+lines_after_imports=2

setup.py

@@ -2,6 +2,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
+
 version = '4.0.0b2.dev0'
 longdescription = open('README.rst').read()
 longdescription += '\n'