From e3c14bed8d2329f1f7774f296544e0b7093b4b48 Mon Sep 17 00:00:00 2001
From: Michael Howitz <icemac@gmx.net>
Date: Tue, 26 Mar 2024 09:13:35 +0100
Subject: [PATCH] Make isort happy.

---
 setup.py                                 |  3 ++-
 src/persistent/__init__.py               |  4 +++-
 src/persistent/_compat.py                |  7 ++++---
 src/persistent/_ring_build.py            |  2 ++
 src/persistent/interfaces.py             |  2 +-
 src/persistent/list.py                   |  4 +++-
 src/persistent/mapping.py                |  4 +++-
 src/persistent/persistence.py            | 10 ++++++----
 src/persistent/picklecache.py            | 10 +++++-----
 src/persistent/ring.py                   |  1 +
 src/persistent/tests/attrhooks.py        |  1 +
 src/persistent/tests/cucumbers.py        |  1 +
 src/persistent/tests/test__compat.py     |  3 ++-
 src/persistent/tests/test_docs.py        |  2 +-
 src/persistent/tests/test_list.py        |  1 -
 src/persistent/tests/test_mapping.py     |  2 +-
 src/persistent/tests/test_persistence.py | 15 +++++++++++++--
 src/persistent/tests/test_picklecache.py |  8 +++++---
 src/persistent/tests/test_ring.py        |  1 +
 src/persistent/tests/test_timestamp.py   |  2 +-
 src/persistent/tests/utils.py            | 11 +++++++----
 src/persistent/timestamp.py              |  3 ++-
 src/persistent/wref.py                   |  1 +
 23 files changed, 66 insertions(+), 32 deletions(-)

diff --git a/setup.py b/setup.py
index 7451a69..65a255a 100644
--- a/setup.py
+++ b/setup.py
@@ -12,13 +12,14 @@
 #
 ##############################################################################
 
-import platform
 import os
+import platform
 
 from setuptools import Extension
 from setuptools import find_packages
 from setuptools import setup
 
+
 version = '5.3.dev0'
 
 here = os.path.abspath(os.path.dirname(__file__))
diff --git a/src/persistent/__init__.py b/src/persistent/__init__.py
index 96c1000..187a5d1 100644
--- a/src/persistent/__init__.py
+++ b/src/persistent/__init__.py
@@ -18,6 +18,7 @@
 
 import sys
 
+
 __all__ = [
     'IPersistent',
     'Persistent',
@@ -31,9 +32,10 @@
 
 # Take care not to shadow the module names
 from persistent import interfaces as _interfaces
-from persistent import timestamp as _timestamp
 from persistent import persistence as _persistence
 from persistent import picklecache as _picklecache
+from persistent import timestamp as _timestamp
+
 
 IPersistent = _interfaces.IPersistent
 Persistent = _persistence.Persistent
diff --git a/src/persistent/_compat.py b/src/persistent/_compat.py
index a93af97..69b03dc 100644
--- a/src/persistent/_compat.py
+++ b/src/persistent/_compat.py
@@ -12,12 +12,13 @@
 #
 ##############################################################################
 
-import sys
 import os
+import sys
 import types
 
-from zope.interface import implementedBy
 from zope.interface import classImplements
+from zope.interface import implementedBy
+
 
 __all__ = [
     'use_c_impl',
@@ -52,9 +53,9 @@ def _c_optimizations_available():
     """
     catch = () if _c_optimizations_required() else (ImportError,)
     try:
+        from persistent import _timestamp
         from persistent import cPersistence
         from persistent import cPickleCache
-        from persistent import _timestamp
         return {
             'persistent.persistence': cPersistence,
             'persistent.picklecache': cPickleCache,
diff --git a/src/persistent/_ring_build.py b/src/persistent/_ring_build.py
index efae96c..e921c6a 100644
--- a/src/persistent/_ring_build.py
+++ b/src/persistent/_ring_build.py
@@ -13,8 +13,10 @@
 ##############################################################################
 
 import os
+
 from cffi import FFI
 
+
 this_dir = os.path.dirname(os.path.abspath(__file__))
 
 ffi = FFI()
diff --git a/src/persistent/interfaces.py b/src/persistent/interfaces.py
index bfd1725..eee60bb 100644
--- a/src/persistent/interfaces.py
+++ b/src/persistent/interfaces.py
@@ -14,8 +14,8 @@
 """Persistence Interfaces
 """
 
-from zope.interface import Interface
 from zope.interface import Attribute
+from zope.interface import Interface
 
 from persistent._compat import use_c_impl
 
diff --git a/src/persistent/list.py b/src/persistent/list.py
index 52ef6aa..678725c 100644
--- a/src/persistent/list.py
+++ b/src/persistent/list.py
@@ -14,9 +14,11 @@
 
 """Python implementation of persistent list."""
 import sys
-import persistent
 from collections import UserList
 
+import persistent
+
+
 # The slice object you get when you write list[:]
 _SLICE_ALL = slice(None, None, None)
 
diff --git a/src/persistent/mapping.py b/src/persistent/mapping.py
index d08b930..195131a 100644
--- a/src/persistent/mapping.py
+++ b/src/persistent/mapping.py
@@ -13,9 +13,11 @@
 ##############################################################################
 
 """Python implementation of persistent base types."""
-import persistent
 from collections import UserDict as IterableUserDict
 
+import persistent
+
+
 class default:
 
     def __init__(self, func):
diff --git a/src/persistent/persistence.py b/src/persistent/persistence.py
index fa62629..9498176 100644
--- a/src/persistent/persistence.py
+++ b/src/persistent/persistence.py
@@ -11,16 +11,18 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
+import copyreg
 import struct
+from sys import intern
 
 from zope.interface import implementer
+
 from persistent import interfaces
+from persistent._compat import use_c_impl
 from persistent.interfaces import SERIAL_TYPE
-from persistent.timestamp import TimeStamp
 from persistent.timestamp import _ZERO
-import copyreg
-from sys import intern
-from persistent._compat import use_c_impl
+from persistent.timestamp import TimeStamp
+
 
 __all__ = [
     'Persistent',
diff --git a/src/persistent/picklecache.py b/src/persistent/picklecache.py
index eac0939..03aa6ce 100644
--- a/src/persistent/picklecache.py
+++ b/src/persistent/picklecache.py
@@ -12,23 +12,23 @@
 #
 ##############################################################################
 import gc
-
 from weakref import WeakValueDictionary
 
-from zope.interface import implementer
 from zope.interface import classImplements
+from zope.interface import implementer
 
-from persistent._compat import use_c_impl
 from persistent._compat import PYPY
+from persistent._compat import use_c_impl
 from persistent.interfaces import GHOST
-from persistent.interfaces import IPickleCache
-from persistent.interfaces import IExtendedPickleCache
 from persistent.interfaces import OID_TYPE
 from persistent.interfaces import UPTODATE
+from persistent.interfaces import IExtendedPickleCache
+from persistent.interfaces import IPickleCache
 from persistent.persistence import PersistentPy
 from persistent.persistence import _estimated_size_in_24_bits
 from persistent.ring import Ring
 
+
 __all__ = [
     'PickleCache',
     'PickleCachePy',
diff --git a/src/persistent/ring.py b/src/persistent/ring.py
index 7a7257a..86f35ff 100644
--- a/src/persistent/ring.py
+++ b/src/persistent/ring.py
@@ -20,6 +20,7 @@
 
 from persistent import _ring
 
+
 class IRing(Interface):
     """Conceptually, a doubly-linked list for efficiently keeping track of least-
     and most-recently used :class:`persistent.interfaces.IPersistent` objects.
diff --git a/src/persistent/tests/attrhooks.py b/src/persistent/tests/attrhooks.py
index 528efe9..a573ae4 100644
--- a/src/persistent/tests/attrhooks.py
+++ b/src/persistent/tests/attrhooks.py
@@ -18,6 +18,7 @@
 
 from persistent import Persistent
 
+
 def _resettingJar():
     from persistent.tests.utils import ResettingJar
     return ResettingJar()
diff --git a/src/persistent/tests/cucumbers.py b/src/persistent/tests/cucumbers.py
index 87f3f72..e6ca7e8 100644
--- a/src/persistent/tests/cucumbers.py
+++ b/src/persistent/tests/cucumbers.py
@@ -15,6 +15,7 @@
 
 from persistent import Persistent
 
+
 def print_dict(d):
     d = sorted(d.items())
     print('{%s}' % (', '.join(
diff --git a/src/persistent/tests/test__compat.py b/src/persistent/tests/test__compat.py
index 984fdb6..cfa4085 100644
--- a/src/persistent/tests/test__compat.py
+++ b/src/persistent/tests/test__compat.py
@@ -16,11 +16,12 @@
 
 """
 
-import unittest
 import os
+import unittest
 
 from persistent import _compat as compat
 
+
 class TestCOptimizationsFuncs(unittest.TestCase):
     # pylint:disable=protected-access
     def setUp(self):
diff --git a/src/persistent/tests/test_docs.py b/src/persistent/tests/test_docs.py
index 20f0d6b..1b52a51 100644
--- a/src/persistent/tests/test_docs.py
+++ b/src/persistent/tests/test_docs.py
@@ -19,9 +19,9 @@
 # disable: accessing protected members, too many methods
 # pylint: disable=W0212,R0904
 
+import doctest
 import os.path
 import unittest
-import doctest
 
 import manuel.capture
 import manuel.codeblock
diff --git a/src/persistent/tests/test_list.py b/src/persistent/tests/test_list.py
index a0555fe..62005ee 100644
--- a/src/persistent/tests/test_list.py
+++ b/src/persistent/tests/test_list.py
@@ -16,7 +16,6 @@
 
 import unittest
 
-
 from persistent.tests.utils import TrivialJar
 from persistent.tests.utils import copy_test
 
diff --git a/src/persistent/tests/test_mapping.py b/src/persistent/tests/test_mapping.py
index d188894..a198c45 100644
--- a/src/persistent/tests/test_mapping.py
+++ b/src/persistent/tests/test_mapping.py
@@ -13,10 +13,10 @@
 ##############################################################################
 import unittest
 
-
 from persistent.tests.utils import TrivialJar
 from persistent.tests.utils import copy_test
 
+
 # pylint:disable=blacklisted-name, protected-access
 
 class Test_default(unittest.TestCase):
diff --git a/src/persistent/tests/test_persistence.py b/src/persistent/tests/test_persistence.py
index 03b3196..8baf71e 100644
--- a/src/persistent/tests/test_persistence.py
+++ b/src/persistent/tests/test_persistence.py
@@ -12,13 +12,14 @@
 #
 ##############################################################################
 
+import copyreg
 import re
 import unittest
+from collections import UserDict as IterableUserDict
 
-import copyreg
 from persistent._compat import PYPY
 from persistent.tests.utils import skipIfNoCExtension
-from collections import UserDict as IterableUserDict
+
 
 # pylint:disable=R0904,W0212,E1101
 # pylint:disable=attribute-defined-outside-init,too-many-lines
@@ -45,6 +46,7 @@ def _makeOne(self, *args, **kw):
 
     def _makeJar(self, real_cache=False):
         from zope.interface import implementer
+
         from persistent.interfaces import IPersistentDataManager
 
         @implementer(IPersistentDataManager)
@@ -75,6 +77,7 @@ def register(self, obj):
 
     def _makeBrokenJar(self):
         from zope.interface import implementer
+
         from persistent.interfaces import IPersistentDataManager
 
         @implementer(IPersistentDataManager)
@@ -105,11 +108,13 @@ def _makeOneWithJar(self, klass=None, broken_jar=False, real_cache=False):
 
     def test_class_conforms_to_IPersistent(self):
         from zope.interface.verify import verifyClass
+
         from persistent.interfaces import IPersistent
         verifyClass(IPersistent, self._getTargetClass())
 
     def test_instance_conforms_to_IPersistent(self):
         from zope.interface.verify import verifyObject
+
         from persistent.interfaces import IPersistent
         verifyObject(IPersistent, self._makeOne())
 
@@ -1141,6 +1146,7 @@ def _get_cucumber(self, name):
 
     def test_pickle_roundtrip_simple(self):
         import pickle
+
         # XXX s.b. 'examples'
         Simple = self._get_cucumber('Simple')
         inst = Simple('testing')
@@ -1152,6 +1158,7 @@ def test_pickle_roundtrip_simple(self):
 
     def test_pickle_roundtrip_w_getnewargs_and_getstate(self):
         import pickle
+
         # XXX s.b. 'examples'
         Custom = self._get_cucumber('Custom')
         inst = Custom('x', 'y')
@@ -1163,6 +1170,7 @@ def test_pickle_roundtrip_w_getnewargs_and_getstate(self):
 
     def test_pickle_roundtrip_w_slots_missing_slot(self):
         import pickle
+
         # XXX s.b. 'examples'
         SubSlotted = self._get_cucumber('SubSlotted')
         inst = SubSlotted('x', 'y', 'z')
@@ -1174,6 +1182,7 @@ def test_pickle_roundtrip_w_slots_missing_slot(self):
 
     def test_pickle_roundtrip_w_slots_filled_slot(self):
         import pickle
+
         # XXX s.b. 'examples'
         SubSlotted = self._get_cucumber('SubSlotted')
         inst = SubSlotted('x', 'y', 'z')
@@ -1186,6 +1195,7 @@ def test_pickle_roundtrip_w_slots_filled_slot(self):
 
     def test_pickle_roundtrip_w_slots_and_empty_dict(self):
         import pickle
+
         # XXX s.b. 'examples'
         SubSubSlotted = self._get_cucumber('SubSubSlotted')
         inst = SubSubSlotted('x', 'y', 'z')
@@ -1197,6 +1207,7 @@ def test_pickle_roundtrip_w_slots_and_empty_dict(self):
 
     def test_pickle_roundtrip_w_slots_and_filled_dict(self):
         import pickle
+
         # XXX s.b. 'examples'
         SubSubSlotted = self._get_cucumber('SubSubSlotted')
         inst = SubSubSlotted('x', 'y', 'z', foo='bar', baz='bam')
diff --git a/src/persistent/tests/test_picklecache.py b/src/persistent/tests/test_picklecache.py
index 6f076de..7fd1150 100644
--- a/src/persistent/tests/test_picklecache.py
+++ b/src/persistent/tests/test_picklecache.py
@@ -14,8 +14,8 @@
 import gc
 import unittest
 
-from persistent.interfaces import UPTODATE
 from persistent._compat import PYPY
+from persistent.interfaces import UPTODATE
 from persistent.tests.utils import skipIfNoCExtension
 
 
@@ -1240,9 +1240,11 @@ class DummyPersistent(self._getRealPersistentClass()):
     def test_inst_does_not_conform_to_IExtendedPickleCache(self):
         # Test that ``@use_c_impl`` is only applying the correct
         # interface declaration to the C implementation.
-        from persistent.interfaces import IExtendedPickleCache
-        from zope.interface.verify import verifyObject
         from zope.interface.exceptions import Invalid
+        from zope.interface.verify import verifyObject
+
+        from persistent.interfaces import IExtendedPickleCache
+
         # We don't claim to implement it.
         self.assertFalse(IExtendedPickleCache.providedBy(self._makeOne()))
         # And we don't even provide everything it asks for.
diff --git a/src/persistent/tests/test_ring.py b/src/persistent/tests/test_ring.py
index f3d9ab6..efa2810 100644
--- a/src/persistent/tests/test_ring.py
+++ b/src/persistent/tests/test_ring.py
@@ -15,6 +15,7 @@
 
 from .. import ring
 
+
 # pylint:disable=protected-access
 
 class DummyPersistent:
diff --git a/src/persistent/tests/test_timestamp.py b/src/persistent/tests/test_timestamp.py
index d20dfd6..91aa0da 100644
--- a/src/persistent/tests/test_timestamp.py
+++ b/src/persistent/tests/test_timestamp.py
@@ -17,7 +17,6 @@
 from persistent.tests.utils import skipIfNoCExtension
 
 
-
 class Test__UTC(unittest.TestCase):
 
     def _getTargetClass(self):
@@ -157,6 +156,7 @@ def test_repr(self):
 
     def test_comparisons_to_non_timestamps(self):
         import operator
+
         # Check the corner cases when comparing non-comparable types
         ts = self._makeOne(2011, 2, 16, 14, 37, 22.0)
 
diff --git a/src/persistent/tests/utils.py b/src/persistent/tests/utils.py
index f6610b4..49cb350 100644
--- a/src/persistent/tests/utils.py
+++ b/src/persistent/tests/utils.py
@@ -11,9 +11,10 @@ class ResettingJar:
     """Testing stub for _p_jar attribute.
     """
     def __init__(self):
-        from persistent import PickleCache # XXX stub it!
-        from persistent.interfaces import IPersistentDataManager
         from zope.interface import directlyProvides
+
+        from persistent import PickleCache  # XXX stub it!
+        from persistent.interfaces import IPersistentDataManager
         self.cache = self._cache = PickleCache(self)
         self.oid = 1
         self.registered = {}
@@ -39,7 +40,7 @@ class RememberingJar:
     """Testing stub for _p_jar attribute.
     """
     def __init__(self):
-        from persistent import PickleCache # XXX stub it!
+        from persistent import PickleCache  # XXX stub it!
         self.cache = PickleCache(self)
         self.oid = 1
         self.registered = {}
@@ -74,6 +75,7 @@ def setstate(self, obj):
 
 def copy_test(self, obj):
     import copy
+
     # Test copy.copy. Do this first, because depending on the
     # version of Python, `UserDict.copy()` may wind up
     # mutating the original object's ``data`` (due to our
@@ -95,9 +97,10 @@ def copy_test(self, obj):
 
 def skipIfNoCExtension(o):
     import unittest
-    from persistent._compat import _should_attempt_c_optimizations
+
     from persistent._compat import _c_optimizations_available
     from persistent._compat import _c_optimizations_ignored
+    from persistent._compat import _should_attempt_c_optimizations
 
     if _should_attempt_c_optimizations() and not _c_optimizations_available(): # pragma: no cover
         return unittest.expectedFailure(o)
diff --git a/src/persistent/timestamp.py b/src/persistent/timestamp.py
index aceb751..d9e6deb 100644
--- a/src/persistent/timestamp.py
+++ b/src/persistent/timestamp.py
@@ -14,14 +14,15 @@
 __all__ = ('TimeStamp',)
 
 import datetime
+import functools
 import math
 import struct
 import sys
-import functools
 from datetime import timezone
 
 from persistent._compat import use_c_impl
 
+
 _RAWTYPE = bytes
 _MAXINT = sys.maxsize
 
diff --git a/src/persistent/wref.py b/src/persistent/wref.py
index 54dd0ca..85517dc 100644
--- a/src/persistent/wref.py
+++ b/src/persistent/wref.py
@@ -16,6 +16,7 @@
 
 from persistent import Persistent
 
+
 WeakRefMarker = object()
 
 class WeakRef: