Skip to content

Commit

Permalink
Apply isort. (#286)
Browse files Browse the repository at this point in the history
  • Loading branch information
icemac authored Feb 16, 2024
1 parent ae03614 commit b27165d
Show file tree
Hide file tree
Showing 45 changed files with 204 additions and 150 deletions.
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@

import os
import sys

from distutils.errors import CCompilerError
from distutils.errors import DistutilsExecError
from distutils.errors import DistutilsPlatformError

from setuptools import setup, Extension
from setuptools.command.build_ext import build_ext
from setuptools import Extension
from setuptools import find_packages
from setuptools import setup
from setuptools.command.build_ext import build_ext


class optional_build_ext(build_ext):
Expand Down
11 changes: 4 additions & 7 deletions src/zope/interface/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,14 @@ def meth(arg1, arg2):
from zope.interface.interface import Interface
from zope.interface.interface import _wire


# Need to actually get the interface elements to implement the right interfaces
_wire()
del _wire

from zope.interface.declarations import Declaration
# The following are to make spec pickles cleaner
from zope.interface.declarations import Provides
from zope.interface.declarations import alsoProvides
from zope.interface.declarations import classImplements
from zope.interface.declarations import classImplementsFirst
Expand All @@ -72,20 +75,14 @@ def meth(arg1, arg2):
from zope.interface.declarations import noLongerProvides
from zope.interface.declarations import providedBy
from zope.interface.declarations import provider

from zope.interface.exceptions import Invalid

from zope.interface.interface import Attribute
from zope.interface.interface import interfacemethod
from zope.interface.interface import invariant
from zope.interface.interface import taggedValue

# The following are to make spec pickles cleaner
from zope.interface.declarations import Provides


from zope.interface.interfaces import IInterfaceDeclaration


moduleProvides(IInterfaceDeclaration)

__all__ = ('Interface', 'Attribute') + tuple(IInterfaceDeclaration)
Expand Down
1 change: 1 addition & 0 deletions src/zope/interface/_flatten.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"""
from zope.interface import Declaration


def _flatten(implements, include_None=0):

try:
Expand Down
6 changes: 3 additions & 3 deletions src/zope/interface/adapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
import itertools
import weakref

from zope.interface import Interface
from zope.interface import implementer
from zope.interface import providedBy
from zope.interface import Interface
from zope.interface import ro
from zope.interface.interfaces import IAdapterRegistry

from zope.interface._compat import _normalize_name
from zope.interface._compat import _use_c_impl
from zope.interface.interfaces import IAdapterRegistry


__all__ = [
'AdapterRegistry',
Expand Down
2 changes: 2 additions & 0 deletions src/zope/interface/advice.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

from types import FunctionType


__all__ = [
'determineMetaclass',
'getFrameInfo',
Expand All @@ -36,6 +37,7 @@

import sys


def getFrameInfo(frame):
"""Return (kind,module,locals,globals) for a frame
Expand Down
5 changes: 3 additions & 2 deletions src/zope/interface/common/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@
import itertools
from types import FunctionType

from zope.interface import classImplements
from zope.interface import Interface
from zope.interface.interface import fromFunction
from zope.interface import classImplements
from zope.interface.interface import InterfaceClass
from zope.interface.interface import _decorator_non_return
from zope.interface.interface import fromFunction


__all__ = [
# Nothing public here.
Expand Down
4 changes: 2 additions & 2 deletions src/zope/interface/common/builtins.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
"""

from zope.interface import classImplements

from zope.interface.common import collections
from zope.interface.common import numbers
from zope.interface.common import io
from zope.interface.common import numbers


__all__ = [
'IList',
Expand Down
6 changes: 3 additions & 3 deletions src/zope/interface/common/collections.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,17 @@
"""

import sys

from abc import ABCMeta
from collections import abc
from collections import OrderedDict
from collections import UserList
from collections import UserDict
from collections import UserList
from collections import UserString
from collections import abc

from zope.interface.common import ABCInterface
from zope.interface.common import optional


# pylint:disable=inherit-non-class,
# pylint:disable=no-self-argument,no-method-argument
# pylint:disable=unexpected-special-method-signature
Expand Down
11 changes: 8 additions & 3 deletions src/zope/interface/common/idatetime.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,14 @@
This module is called idatetime because if it were called datetime the import
of the real datetime would fail.
"""
from datetime import timedelta, date, datetime, time, tzinfo

from zope.interface import Interface, Attribute
from datetime import date
from datetime import datetime
from datetime import time
from datetime import timedelta
from datetime import tzinfo

from zope.interface import Attribute
from zope.interface import Interface
from zope.interface import classImplements


Expand Down
1 change: 1 addition & 0 deletions src/zope/interface/common/interfaces.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
from zope.interface import Interface
from zope.interface import classImplements


class IException(Interface):
"Interface for `Exception`"
classImplements(Exception, IException)
Expand Down
1 change: 1 addition & 0 deletions src/zope/interface/common/io.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

from zope.interface.common import ABCInterface


# pylint:disable=inherit-non-class,
# pylint:disable=no-member

Expand Down
1 change: 1 addition & 0 deletions src/zope/interface/common/mapping.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
from zope.interface import Interface
from zope.interface.common import collections


class IItemMapping(Interface):
"""Simplest readable mapping object
"""
Expand Down
1 change: 1 addition & 0 deletions src/zope/interface/common/sequence.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
from zope.interface import Interface
from zope.interface.common import collections


class IMinimalSequence(collections.IIterable):
"""Most basic sequence interface.
Expand Down
9 changes: 4 additions & 5 deletions src/zope/interface/common/tests/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@

import unittest

from zope.interface.verify import verifyClass
from zope.interface.verify import verifyObject

from zope.interface.common import ABCInterface
from zope.interface.common import ABCInterfaceClass
from zope.interface.verify import verifyClass
from zope.interface.verify import verifyObject


def iter_abc_interfaces(predicate=lambda iface: True):
Expand Down Expand Up @@ -72,9 +71,9 @@ def test(self, stdlib_class=stdlib_class, iface=iface):
setattr(cls, name, test)

def test_ro(self, stdlib_class=stdlib_class, iface=iface):
from zope.interface import ro
from zope.interface import implementedBy
from zope.interface import Interface
from zope.interface import implementedBy
from zope.interface import ro
self.assertEqual(
tuple(ro.ro(iface, strict=True)),
iface.__sro__)
Expand Down
1 change: 1 addition & 0 deletions src/zope/interface/common/tests/basemapping.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"""
from operator import __getitem__


def testIReadMapping(self, inst, state, absent):
for key in state:
self.assertEqual(inst[key], state[key])
Expand Down
14 changes: 4 additions & 10 deletions src/zope/interface/common/tests/test_collections.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,20 @@

import array
import unittest
from collections import OrderedDict
from collections import abc
from collections import deque
from collections import OrderedDict


from types import MappingProxyType

from zope.interface import Invalid


from zope.interface._compat import PYPY
# Note that importing z.i.c.collections does work on import.
from zope.interface.common import collections


from zope.interface._compat import PYPY


from . import add_abc_interface_tests
from . import VerifyClassMixin
from . import VerifyObjectMixin
from . import add_abc_interface_tests


class TestVerifyClass(VerifyClassMixin, unittest.TestCase):

Expand Down
23 changes: 17 additions & 6 deletions src/zope/interface/common/tests/test_idatetime.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,24 @@
"""

import unittest
from datetime import date
from datetime import datetime
from datetime import time
from datetime import timedelta
from datetime import tzinfo

from zope.interface.common.idatetime import IDate
from zope.interface.common.idatetime import IDateClass
from zope.interface.common.idatetime import IDateTime
from zope.interface.common.idatetime import IDateTimeClass
from zope.interface.common.idatetime import ITime
from zope.interface.common.idatetime import ITimeClass
from zope.interface.common.idatetime import ITimeDelta
from zope.interface.common.idatetime import ITimeDeltaClass
from zope.interface.common.idatetime import ITZInfo
from zope.interface.verify import verifyClass
from zope.interface.verify import verifyObject

from zope.interface.verify import verifyObject, verifyClass
from zope.interface.common.idatetime import ITimeDelta, ITimeDeltaClass
from zope.interface.common.idatetime import IDate, IDateClass
from zope.interface.common.idatetime import IDateTime, IDateTimeClass
from zope.interface.common.idatetime import ITime, ITimeClass, ITZInfo
from datetime import timedelta, date, datetime, time, tzinfo

class TestDateTimeInterfaces(unittest.TestCase):

Expand Down
1 change: 1 addition & 0 deletions src/zope/interface/common/tests/test_import_interfaces.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
##############################################################################
import unittest


class TestInterfaceImport(unittest.TestCase):

def test_import(self):
Expand Down
4 changes: 2 additions & 2 deletions src/zope/interface/common/tests/test_io.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
##############################################################################


import unittest
import io as abc
import unittest

# Note that importing z.i.c.io does work on import.
from zope.interface.common import io

from . import add_abc_interface_tests
from . import VerifyClassMixin
from . import VerifyObjectMixin
from . import add_abc_interface_tests


class TestVerifyClass(VerifyClassMixin,
Expand Down
4 changes: 2 additions & 2 deletions src/zope/interface/common/tests/test_numbers.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
##############################################################################


import unittest
import numbers as abc
import unittest

# Note that importing z.i.c.numbers does work on import.
from zope.interface.common import numbers

from . import add_abc_interface_tests
from . import VerifyClassMixin
from . import VerifyObjectMixin
from . import add_abc_interface_tests


class TestVerifyClass(VerifyClassMixin,
Expand Down
9 changes: 5 additions & 4 deletions src/zope/interface/declarations.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,18 @@ class implements (that instances of the class provides).
__docformat__ = 'restructuredtext'

import sys
import weakref
from types import FunctionType
from types import MethodType
from types import ModuleType
import weakref

from zope.interface._compat import _use_c_impl
from zope.interface.interface import Interface
from zope.interface.interface import InterfaceClass
from zope.interface.interface import SpecificationBase
from zope.interface.interface import Specification
from zope.interface.interface import NameAndModuleComparisonMixin
from zope.interface._compat import _use_c_impl
from zope.interface.interface import Specification
from zope.interface.interface import SpecificationBase


__all__ = [
# None. The public APIs of this module are
Expand Down
1 change: 1 addition & 0 deletions src/zope/interface/document.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"""
import zope.interface


__all__ = [
'asReStructuredText',
'asStructuredText',
Expand Down
2 changes: 1 addition & 1 deletion src/zope/interface/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ def mess(self):
def __implementation_str(impl):
# It could be a callable or some arbitrary object, we don't
# know yet.
import inspect # Inspect is a heavy-weight dependency, lots of imports
import inspect # Inspect is a heavy-weight dependency, lots of imports
try:
sig = inspect.signature
formatsig = str
Expand Down
Loading

0 comments on commit b27165d

Please sign in to comment.