chore: pyupgrade

plone/__init__.py

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

plone/memoize/__init__.py

@@ -1 +0,0 @@
-# -*- coding: utf-8 -*-

plone/memoize/compress.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """XHTML Compressor
 """
 
@@ -22,7 +21,7 @@ def xhtml_compress(string):
 
 
 @implementer(IXHTMLCompressor)
-class XHTMLSlimmer(object):
+class XHTMLSlimmer:
     def compress(self, string):
         if SLIMMER:
             return xhtml_slimmer(string)

plone/memoize/forever.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Memo decorators for globals - memoized values survive for as long as the
 process lives.
 

plone/memoize/instance.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Memo decorators for instances.
 
 Stores values in an attribute on the instance. See instance.rst.
@@ -11,7 +10,7 @@
 _marker = object()
 
 
-class Memojito(object):
+class Memojito:
     propname = "_memojito_"
 
     def clear(self, inst):

plone/memoize/interfaces.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from zope.interface import Interface
 
 

plone/memoize/ram.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """A cache decorator that uses RAMCache by default.
 """
 
@@ -40,7 +39,7 @@ def __init__(self, client, globalkey=""):
         self.globalkey = globalkey and "%s:" % globalkey
 
     def _make_key(self, source):
-        if issubclass(type(source), six.text_type):
+        if issubclass(type(source), str):
             source = source.encode("utf-8")
         return sha1(source).hexdigest()
 
@@ -62,7 +61,7 @@ def __init__(self, ramcache, globalkey=""):
         self.globalkey = globalkey
 
     def _make_key(self, source):
-        if issubclass(type(source), six.text_type):
+        if issubclass(type(source), str):
             source = source.encode("utf-8")
         return sha1(source).digest()
 
@@ -87,7 +86,7 @@ def choose_cache(fun_name):
 
 
 def store_in_cache(fun, *args, **kwargs):
-    key = "%s.%s" % (fun.__module__, fun.__name__)
+    key = f"{fun.__module__}.{fun.__name__}"
     cache_chooser = component.queryUtility(ICacheChooser)
     if cache_chooser is not None:
         return cache_chooser(key)

plone/memoize/request.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Memoize decorator for methods.
 
 Stores values in an annotation of the request.
@@ -19,7 +18,7 @@
 _marker = object()
 
 
-class RequestMemo(object):
+class RequestMemo:
 
     key = "plone.memoize_request"
 

plone/memoize/tests.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from zope.component.testing import setUp
 from zope.component.testing import tearDown
 from zope.configuration.xmlconfig import XMLConfig

plone/memoize/view.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Memoize decorator for views.
 
 Stores values in an annotation of the request. See view.rst.
@@ -15,7 +14,7 @@ def getRequest():
         return None
 
 
-class ViewMemo(object):
+class ViewMemo:
 
     key = "plone.memoize"
 

plone/memoize/volatile.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """A flexible caching decorator.
 
 This module provides a cache decorator `cache` that you can use to
@@ -18,18 +17,18 @@ class CleanupDict(dict):
     cleanup_period = 60 * 60 * 24 * 3  # 3 days
 
     def __init__(self, cleanup_period=None):
-        super(CleanupDict, self).__init__()
+        super().__init__()
         self._last_access = {}
         if cleanup_period is not None:
             self.cleanup_period = cleanup_period
 
     def __getitem__(self, key):
-        value = super(CleanupDict, self).__getitem__(key)
+        value = super().__getitem__(key)
         self._last_access[key] = time.time()
         return value
 
     def __setitem__(self, key, value):
-        super(CleanupDict, self).__setitem__(key, value)
+        super().__setitem__(key, value)
         self._last_access[key] = time.time()
         self._cleanup()
 
@@ -39,7 +38,7 @@ def _cleanup(self):
         for key, timestamp in list(self._last_access.items()):
             if timestamp < okay:
                 del self._last_access[key]
-                super(CleanupDict, self).__delitem__(key)
+                super().__delitem__(key)
 
 
 ATTR = "_v_memoize_cache"
@@ -67,7 +66,7 @@ def replacement(*args, **kwargs):
                 key = get_key(fun, *args, **kwargs)
             except DontCache:
                 return fun(*args, **kwargs)
-            key = "%s.%s:%s" % (fun.__module__, fun.__name__, key)
+            key = f"{fun.__module__}.{fun.__name__}:{key}"
             cache = get_cache(fun, *args, **kwargs)
             cached_value = cache.get(key, _marker)
             if cached_value is _marker:

setup.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from setuptools import find_packages
 from setuptools import setup
 
@@ -11,7 +10,7 @@ def read(*rnames):
 
 version = "3.0.1.dev0"
 
-long_description = u"\n".join(
+long_description = "\n".join(
     [read("README.rst"), read("plone", "memoize", "README.rst"), read("CHANGES.rst"),]
 )