Merge pull request #26 from plone/overhaul

Overhaul: py3/black/...

news/26.breaking

@@ -0,0 +1,2 @@
+Drop Python 2 support. Code style. 
+[jensens]

plone/__init__.py

@@ -1,2 +1 @@
-# -*- coding: utf-8 -*-
 __import__("pkg_resources").declare_namespace(__name__)

plone/cachepurging/browser.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from plone.cachepurging.interfaces import ICachePurgingSettings
 from plone.cachepurging.interfaces import IPurger
 from plone.cachepurging.utils import getPathsToPurge
@@ -10,28 +9,26 @@
 from zope.event import notify
 
 
-class QueuePurge(object):
-    """Manually initiate a purge
-    """
+class QueuePurge:
+    """Manually initiate a purge"""
 
     def __init__(self, context, request):
         self.context = context
         self.request = request
 
     def __call__(self):
-        self.request.response.setHeader('Content-type', 'text/plain')
+        self.request.response.setHeader("Content-type", "text/plain")
         if not isCachePurgingEnabled():
             return "Cache purging not enabled"
 
         paths = getPathsToPurge(self.context, self.request)
 
         notify(Purge(self.context))
-        return "Queued:\n\n{0}".format("\n".join(paths))
+        return "Queued:\n\n{}".format("\n".join(paths))
 
 
-class PurgeImmediately(object):
-    """Purge immediately
-    """
+class PurgeImmediately:
+    """Purge immediately"""
 
     def __init__(self, context, request):
         self.context = context
@@ -43,7 +40,7 @@ def write(self, msg):
         self.request.response.write(msg)
 
     def __call__(self):
-        self.request.response.setHeader('Content-type', 'text/plain')
+        self.request.response.setHeader("Content-type", "text/plain")
         if not isCachePurgingEnabled():
             return "Cache purging not enabled"
 
@@ -54,17 +51,18 @@ def __call__(self):
         caching_proxies = settings.cachingProxies
         traceback = self.request.form.get("traceback")
         if not traceback:
-            self.write("(hint: add '?traceback' to url to show full traceback in case of errors)\n\n")
-        self.write("Proxies to purge: {0}\n".format(', '.join(caching_proxies)))
+            self.write(
+                "(hint: add '?traceback' to url to show full traceback in case of errors)\n\n"
+            )
+        self.write("Proxies to purge: {}\n".format(", ".join(caching_proxies)))
         for path in getPathsToPurge(self.context, self.request):
-            self.write("- process path: {0}\n".format(path))
+            self.write(f"- process path: {path}\n")
             for url in getURLsToPurge(path, caching_proxies):
-                self.write("  - send to purge {0}\n".format(url).encode("utf-8"))
+                self.write(f"  - send to purge {url}\n".encode("utf-8"))
                 status, xcache, xerror = purger.purgeSync(url)
                 self.write(
                     "    response with status: {status}, X-Cache: {xcache}\n".format(
-                        status=status,
-                        xcache=xcache
+                        status=status, xcache=xcache
                     )
                 )
                 if traceback and xerror:

plone/cachepurging/hooks.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from plone.cachepurging.interfaces import ICachePurgingSettings
 from plone.cachepurging.interfaces import IPurger
 from plone.cachepurging.utils import getPathsToPurge
@@ -18,8 +17,7 @@
 
 @adapter(IPurgeEvent)
 def queuePurge(event):
-    """Find URLs to purge and queue them for later
-    """
+    """Find URLs to purge and queue them for later"""
 
     request = getRequest()
     if request is None:
@@ -38,8 +36,7 @@ def queuePurge(event):
 
 @adapter(IPubSuccess)
 def purge(event):
-    """Asynchronously send PURGE requests
-    """
+    """Asynchronously send PURGE requests"""
 
     request = event.request