chore: pyupgrade

plone/__init__.py

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

plone/resource/__init__.py

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

plone/resource/caching.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from plone.caching.interfaces import IRulesetLookup
 from plone.resource.interfaces import IUniqueResourceRequest
 from zope.component import adapter
@@ -8,7 +7,7 @@
 
 @implementer(IRulesetLookup)
 @adapter(Interface, IUniqueResourceRequest)
-class UniqueResourceLookup(object):
+class UniqueResourceLookup:
     """Unique resource ruleset lookup.
 
     Returns 'plone.stableResource' for requests marked with

plone/resource/directory.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from Acquisition import aq_base
 from Acquisition import aq_parent
 from OFS.Image import File
@@ -28,7 +27,7 @@
 
 
 @implementer(IWritableResourceDirectory)
-class PersistentResourceDirectory(object):
+class PersistentResourceDirectory:
     """A resource directory stored in the ZODB.
 
     It is assumed that directories provide IObjectManager
@@ -45,11 +44,11 @@ def __init__(self, context=None):
         self.__name__ = context.getId()
 
     def __repr__(self):
-        return '<%s object at %s>' % (self.__class__.__name__,
+        return '<{} object at {}>'.format(self.__class__.__name__,
                                       '/'.join(self.context.getPhysicalPath()))
 
     def publishTraverse(self, request, name):
-        if six.PY2 and isinstance(name, six.text_type):
+        if six.PY2 and isinstance(name, str):
             name = name.encode('utf-8')
 
         context = self.context
@@ -73,7 +72,7 @@ def __getitem__(self, name):
         return self.publishTraverse(None, name)
 
     def __setitem__(self, name, item):
-        if six.PY2 and isinstance(name, six.text_type):
+        if six.PY2 and isinstance(name, str):
             name = name.encode('utf-8')
 
         if IResourceDirectory.providedBy(item):
@@ -94,8 +93,8 @@ def readFile(self, path):
         try:
             f = self.context.unrestrictedTraverse(path)
         except Exception as e:
-            raise IOError(str(e))
-        if isinstance(f.data, six.binary_type):
+            raise OSError(str(e))
+        if isinstance(f.data, bytes):
             return f.data
         return f.data.__bytes__()
 
@@ -132,7 +131,7 @@ def exportZip(self, out):
 
         def write(dir, prefix, zf):
             for name in dir.listDirectory():
-                relativeName = "%s/%s" % (prefix, name,)
+                relativeName = f"{prefix}/{name}"
                 if dir.isDirectory(name):
                     write(dir[name], relativeName, zf)
                 elif dir.isFile(name):
@@ -154,7 +153,7 @@ def makeDirectory(self, path):
             parent = parent[name]
 
     def writeFile(self, path, data):
-        if isinstance(data, six.text_type):
+        if isinstance(data, str):
             data = data.encode('utf8')
         basepath = '/'.join(path.split('/')[:-1])
         if basepath:
@@ -196,7 +195,7 @@ def importZip(self, f):
 
 
 @implementer(IResourceDirectory)
-class FilesystemResourceDirectory(object):
+class FilesystemResourceDirectory:
     """A resource directory based on files in the filesystem.
     """
 
@@ -220,7 +219,7 @@ def __parent__(self, value):
         self._parent = value
 
     def __repr__(self):
-        return '<%s object at %s>' % (self.__class__.__name__, self.__name__)
+        return f'<{self.__class__.__name__} object at {self.__name__}>'
 
     def __bytes__(self):
         if six.PY2:

plone/resource/download.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from io import BytesIO
 from zope.publisher.browser import BrowserView
 

plone/resource/file.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from datetime import time
 from dateutil.tz import tzlocal
 from email.utils import formatdate
@@ -28,7 +27,7 @@ def __unicode__(self):
         return self.read().decode('utf-8')
 
 
-class FilesystemFile(object):
+class FilesystemFile:
     """Representation of a file. When called, it will set response headers
     and return the file's contents
     """
@@ -76,7 +75,7 @@ def __call__(self, REQUEST=None, RESPONSE=None):
 
 @implementer(ILastModified)
 @adapter(FilesystemFile)
-class FileLastModified(object):
+class FileLastModified:
     """Determine when a file was last modified, for caching purposes
     """
 

plone/resource/interfaces.py

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

plone/resource/manifest.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Utilities for working with manifest files.
 
 The manifest is stored in a file ``manifest.cfg`` in the root of a resource
@@ -51,7 +50,7 @@
 LOGGER = logging.getLogger('plone.resource.manifest')
 
 
-class ManifestFormat(object):
+class ManifestFormat:
     """Describes a manifest format.
 
     An immutable, threadsafe object.
@@ -88,13 +87,10 @@ def getManifest(fp, format, defaults=None):
         defaults = format.defaults
 
     parser = ConfigParser()
-    if six.PY2:
-        parser.readfp(fp)
-    else:
-        data = fp.read()
-        if isinstance(data, six.binary_type):
-            data = data.decode()
-        parser.read_string(data)
+    data = fp.read()
+    if isinstance(data, bytes):
+        data = data.decode()
+    parser.read_string(data)
 
     results = {}
     for key in format.keys:
@@ -104,7 +100,7 @@ def getManifest(fp, format, defaults=None):
             results[key] = defaults.get(key, None)
 
     for key in format.parameterSections:
-        sectionName = "%s:%s" % (format.resourceType, key,)
+        sectionName = f"{format.resourceType}:{key}"
         if parser.has_section(sectionName):
             results[key] = dict(parser.items(sectionName))
         else:
@@ -174,7 +170,7 @@ def extractManifestFromZipFile(zipfile, format, defaults=None,
         if (
             resourceName is not None and
             not isDirectory and
-            path == "%s/%s" % (resourceName, manifestFilename,)
+            path == f"{resourceName}/{manifestFilename}"
         ):
             manifest = zipfile.open(member)
             try:
@@ -222,7 +218,7 @@ def getAllResources(format, defaults=None, filter=None,
                 resources[name] = getManifest(manifest, format, defaults)
             except:
                 LOGGER.exception(
-                    "Unable to read manifest for theme directory {0}".format(
+                    "Unable to read manifest for theme directory {}".format(
                         name
                     )
                 )
@@ -273,7 +269,7 @@ def getZODBResources(format, defaults=None, filter=None,
                 resources[name] = getManifest(manifest, format, defaults)
             except:
                 LOGGER.exception(
-                    "Unable to read manifest for {0} directory {1}".format(
+                    "Unable to read manifest for {} directory {}".format(
                         manifest.resourceType, name
                     )
                 )

plone/resource/testing.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from plone.app.testing import applyProfile
 from plone.app.testing import IntegrationTesting
 from plone.app.testing import PLONE_FIXTURE

plone/resource/tests/test_directory.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from Acquisition import aq_base
 from io import BytesIO
 from OFS.Image import File
@@ -194,7 +193,7 @@ def test_setitem_file_unicode(self):
         f = dir['demo']['foo']['test.html']
         dir['demo'].makeDirectory('bar')
 
-        dir['demo']['bar'][u'test.html'] = f
+        dir['demo']['bar']['test.html'] = f
         self.assertEqual(dir['demo']['foo'].readFile('test.html'),
                          dir['demo']['bar'].readFile('test.html'),)
 

plone/resource/tests/test_file.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from dateutil.tz import tzlocal
 from email.utils import formatdate
 from plone.resource.file import FileLastModified
@@ -63,8 +62,5 @@ def test_raw_read_file(self):
         f = FilesystemFile(None, request, path, name)
 
         with IRawReadFile(f) as rf:
-            if six.PY2:
-                self.assertTrue(isinstance(rf, file))
-            else:
-                self.assertTrue(isinstance(rf, io.IOBase))
+            self.assertTrue(isinstance(rf, io.IOBase))
             self.assertEqual(rf.read(), b'asdf')

plone/resource/tests/test_integration.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from plone.resource.interfaces import IResourceDirectory
 from plone.resource.testing import PLONE_RESOURCE_INTEGRATION_TESTING
 

plone/resource/tests/test_manifest.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from plone.resource.directory import FilesystemResourceDirectory
 from plone.resource.directory import PersistentResourceDirectory
 from plone.resource.interfaces import IResourceDirectory
@@ -112,18 +111,18 @@ def test_get_all_resources(self):
         app = self.layer['app']
 
         foo = FilesystemResourceDirectory(os.path.join(test_dir_path, 'demo', 'foo'))
-        provideUtility(foo, provides=IResourceDirectory, name=u'++demo++foo')
+        provideUtility(foo, provides=IResourceDirectory, name='++demo++foo')
 
         manifestTest = FilesystemResourceDirectory(os.path.join(test_dir_path, 'demo', 'manifest-test'))
-        provideUtility(manifestTest, provides=IResourceDirectory, name=u'++demo++manifest-test')
+        provideUtility(manifestTest, provides=IResourceDirectory, name='++demo++manifest-test')
 
         root = BTreeFolder2('portal_resources')
         app._setOb('portal_resources', root)
         root._setOb('demo', BTreeFolder2('demo'))
         root['demo']._setOb('bar', BTreeFolder2('bar'))
 
         persistentDir = PersistentResourceDirectory(root)
-        provideUtility(persistentDir, provides=IResourceDirectory, name=u'persistent')
+        provideUtility(persistentDir, provides=IResourceDirectory, name='persistent')
 
         resources = getAllResources(TEST_FORMAT)
 
@@ -140,18 +139,18 @@ def test_get_all_resources_filter(self):
         app = self.layer['app']
 
         foo = FilesystemResourceDirectory(os.path.join(test_dir_path, 'demo', 'foo'))
-        provideUtility(foo, provides=IResourceDirectory, name=u'++demo++foo')
+        provideUtility(foo, provides=IResourceDirectory, name='++demo++foo')
 
         manifestTest = FilesystemResourceDirectory(os.path.join(test_dir_path, 'demo', 'manifest-test'))
-        provideUtility(manifestTest, provides=IResourceDirectory, name=u'++demo++manifest-test')
+        provideUtility(manifestTest, provides=IResourceDirectory, name='++demo++manifest-test')
 
         root = BTreeFolder2('portal_resources')
         app._setOb('portal_resources', root)
         root._setOb('demo', BTreeFolder2('demo'))
         root['demo']._setOb('bar', BTreeFolder2('bar'))
 
         persistentDir = PersistentResourceDirectory(root)
-        provideUtility(persistentDir, provides=IResourceDirectory, name=u'persistent')
+        provideUtility(persistentDir, provides=IResourceDirectory, name='persistent')
 
         resources = getAllResources(TEST_FORMAT, filter=lambda dir: dir.__name__ != 'foo')
 
@@ -167,10 +166,10 @@ def test_get_zodb_resources(self):
         app = self.layer['app']
 
         foo = FilesystemResourceDirectory(os.path.join(test_dir_path, 'demo', 'foo'))
-        provideUtility(foo, provides=IResourceDirectory, name=u'++demo++foo')
+        provideUtility(foo, provides=IResourceDirectory, name='++demo++foo')
 
         manifestTest = FilesystemResourceDirectory(os.path.join(test_dir_path, 'demo', 'manifest-test'))
-        provideUtility(manifestTest, provides=IResourceDirectory, name=u'++demo++manifest-test')
+        provideUtility(manifestTest, provides=IResourceDirectory, name='++demo++manifest-test')
 
         root = BTreeFolder2('portal_resources')
         app._setOb('portal_resources', root)
@@ -179,7 +178,7 @@ def test_get_zodb_resources(self):
         root['demo']._setOb('baz', BTreeFolder2('baz'))
 
         persistentDir = PersistentResourceDirectory(root)
-        provideUtility(persistentDir, provides=IResourceDirectory, name=u'persistent')
+        provideUtility(persistentDir, provides=IResourceDirectory, name='persistent')
 
         resources = getZODBResources(TEST_FORMAT)
 
@@ -193,10 +192,10 @@ def test_get_zodb_resources_filter(self):
         app = self.layer['app']
 
         foo = FilesystemResourceDirectory(os.path.join(test_dir_path, 'demo', 'foo'))
-        provideUtility(foo, provides=IResourceDirectory, name=u'++demo++foo')
+        provideUtility(foo, provides=IResourceDirectory, name='++demo++foo')
 
         manifestTest = FilesystemResourceDirectory(os.path.join(test_dir_path, 'demo', 'manifest-test'))
-        provideUtility(manifestTest, provides=IResourceDirectory, name=u'++demo++manifest-test')
+        provideUtility(manifestTest, provides=IResourceDirectory, name='++demo++manifest-test')
 
         root = BTreeFolder2('portal_resources')
         app._setOb('portal_resources', root)
@@ -205,7 +204,7 @@ def test_get_zodb_resources_filter(self):
         root['demo']._setOb('baz', BTreeFolder2('baz'))
 
         persistentDir = PersistentResourceDirectory(root)
-        provideUtility(persistentDir, provides=IResourceDirectory, name=u'persistent')
+        provideUtility(persistentDir, provides=IResourceDirectory, name='persistent')
 
         resources = getZODBResources(TEST_FORMAT, filter=lambda dir: dir.__name__ != 'baz')