launchpad-reviewers team mailing list archive

[Colin Watson <mp+411547@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:zope.component-deprecations into launchpad:master.

Commit message:
Avoid deprecated imports from zope.component

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/411547
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:zope.component-deprecations into launchpad:master.

diff --git a/cronscripts/process-mail.py b/cronscripts/process-mail.py
index 02597a8..2fde0d1 100755
--- a/cronscripts/process-mail.py
+++ b/cronscripts/process-mail.py
@@ -7,7 +7,7 @@
 
 import _pythonpath  # noqa: F401
 
-from zope.component.interfaces import ComponentLookupError
+from zope.interface.interfaces import ComponentLookupError
 
 from lp.services.config import config
 from lp.services.mail.incoming import handleMail
diff --git a/lib/lp/app/browser/vocabulary.py b/lib/lp/app/browser/vocabulary.py
index 3bfdeed..4f3cde4 100644
--- a/lib/lp/app/browser/vocabulary.py
+++ b/lib/lp/app/browser/vocabulary.py
@@ -17,13 +17,13 @@ from zope.component import (
     adapter,
     getUtility,
     )
-from zope.component.interfaces import ComponentLookupError
 from zope.formlib.interfaces import MissingInputError
 from zope.interface import (
     Attribute,
     implementer,
     Interface,
     )
+from zope.interface.interfaces import ComponentLookupError
 from zope.schema.interfaces import IVocabularyFactory
 from zope.security.interfaces import Unauthorized
 # This registers the registry.
diff --git a/lib/lp/app/webservice/marshallers.py b/lib/lp/app/webservice/marshallers.py
index b90f549..9c08f54 100644
--- a/lib/lp/app/webservice/marshallers.py
+++ b/lib/lp/app/webservice/marshallers.py
@@ -20,7 +20,7 @@ from zope.component import (
     getMultiAdapter,
     getUtility,
     )
-from zope.component.interfaces import ComponentLookupError
+from zope.interface.interfaces import ComponentLookupError
 from zope.schema.interfaces import (
     IField,
     RequiredMissing,
diff --git a/lib/lp/archiveuploader/tests/test_uploadpolicy.py b/lib/lp/archiveuploader/tests/test_uploadpolicy.py
index 1885e6e..6de69d5 100644
--- a/lib/lp/archiveuploader/tests/test_uploadpolicy.py
+++ b/lib/lp/archiveuploader/tests/test_uploadpolicy.py
@@ -4,7 +4,7 @@
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 from zope.component import getUtility
-from zope.component.interfaces import ComponentLookupError
+from zope.interface.interfaces import ComponentLookupError
 
 from lp.app.errors import NotFoundError
 from lp.archiveuploader.nascentuploadfile import CustomUploadFile
diff --git a/lib/lp/bugs/browser/bugtask.py b/lib/lp/bugs/browser/bugtask.py
index 40f8732..5852a49 100644
--- a/lib/lp/bugs/browser/bugtask.py
+++ b/lib/lp/bugs/browser/bugtask.py
@@ -53,7 +53,6 @@ from zope import formlib
 from zope.browserpage import ViewPageTemplateFile
 from zope.component import (
     adapter,
-    ComponentLookupError,
     getAdapter,
     getMultiAdapter,
     getUtility,
@@ -64,6 +63,7 @@ from zope.interface import (
     implementer,
     providedBy,
     )
+from zope.interface.interfaces import ComponentLookupError
 from zope.schema import Choice
 from zope.schema.vocabulary import (
     getVocabularyRegistry,
diff --git a/lib/lp/bugs/interfaces/buglink.py b/lib/lp/bugs/interfaces/buglink.py
index 5e10854..3eac5d3 100644
--- a/lib/lp/bugs/interfaces/buglink.py
+++ b/lib/lp/bugs/interfaces/buglink.py
@@ -19,12 +19,12 @@ from lazr.restful.fields import (
     CollectionField,
     Reference,
     )
-from zope.component.interfaces import IObjectEvent
 from zope.interface import (
     Attribute,
     implementer,
     Interface,
     )
+from zope.interface.interfaces import IObjectEvent
 from zope.schema import (
     Choice,
     Set,
diff --git a/lib/lp/code/event/branchmergeproposal.py b/lib/lp/code/event/branchmergeproposal.py
index 6dac768..eac6d52 100644
--- a/lib/lp/code/event/branchmergeproposal.py
+++ b/lib/lp/code/event/branchmergeproposal.py
@@ -8,8 +8,8 @@ __all__ = [
     'ReviewerNominatedEvent',
     ]
 
-from zope.component.interfaces import ObjectEvent
 from zope.interface import implementer
+from zope.interface.interfaces import ObjectEvent
 
 from lp.code.interfaces.event import (
     IBranchMergeProposalNeedsReviewEvent,
diff --git a/lib/lp/code/event/git.py b/lib/lp/code/event/git.py
index ae2d3fc..bc89694 100644
--- a/lib/lp/code/event/git.py
+++ b/lib/lp/code/event/git.py
@@ -7,8 +7,8 @@ __all__ = [
     'GitRefsUpdatedEvent',
     ]
 
-from zope.component.interfaces import ObjectEvent
 from zope.interface import implementer
+from zope.interface.interfaces import ObjectEvent
 
 from lp.code.interfaces.event import IGitRefsUpdatedEvent
 
diff --git a/lib/lp/code/interfaces/event.py b/lib/lp/code/interfaces/event.py
index fbe60e2..4ce9107 100644
--- a/lib/lp/code/interfaces/event.py
+++ b/lib/lp/code/interfaces/event.py
@@ -10,7 +10,7 @@ __all__ = [
     ]
 
 
-from zope.component.interfaces import IObjectEvent
+from zope.interface.interfaces import IObjectEvent
 
 
 class IReviewerNominatedEvent(IObjectEvent):
diff --git a/lib/lp/code/xmlrpc/git.py b/lib/lp/code/xmlrpc/git.py
index c7940f0..9278b1a 100644
--- a/lib/lp/code/xmlrpc/git.py
+++ b/lib/lp/code/xmlrpc/git.py
@@ -16,12 +16,10 @@ from pymacaroons import Macaroon
 import six
 from six.moves.urllib.parse import quote
 import transaction
-from zope.component import (
-    ComponentLookupError,
-    getUtility,
-    )
+from zope.component import getUtility
 from zope.error.interfaces import IErrorReportingUtility
 from zope.interface import implementer
+from zope.interface.interfaces import ComponentLookupError
 from zope.security.interfaces import Unauthorized
 from zope.security.proxy import removeSecurityProxy
 
diff --git a/lib/lp/codehosting/scanner/events.py b/lib/lp/codehosting/scanner/events.py
index 0ac4f35..ca42cc6 100644
--- a/lib/lp/codehosting/scanner/events.py
+++ b/lib/lp/codehosting/scanner/events.py
@@ -10,11 +10,11 @@ __all__ = [
     ]
 
 import six
-from zope.component.interfaces import (
+from zope.interface import implementer
+from zope.interface.interfaces import (
     IObjectEvent,
     ObjectEvent,
     )
-from zope.interface import implementer
 
 from lp.services.webapp.publisher import canonical_url
 
diff --git a/lib/lp/registry/adapters.py b/lib/lp/registry/adapters.py
index 3d32234..ef21952 100644
--- a/lib/lp/registry/adapters.py
+++ b/lib/lp/registry/adapters.py
@@ -12,8 +12,8 @@ __all__ = [
 
 
 from zope.component import getUtility
-from zope.component.interfaces import ComponentLookupError
 from zope.interface import implementer
+from zope.interface.interfaces import ComponentLookupError
 
 from lp.archivepublisher.interfaces.publisherconfig import IPublisherConfigSet
 from lp.registry.enums import PollSort
diff --git a/lib/lp/registry/interfaces/karma.py b/lib/lp/registry/interfaces/karma.py
index 9902a72..6cb341e 100644
--- a/lib/lp/registry/interfaces/karma.py
+++ b/lib/lp/registry/interfaces/karma.py
@@ -15,11 +15,11 @@ __all__ = [
     'IKarmaContext',
     ]
 
-from zope.component.interfaces import IObjectEvent
 from zope.interface import (
     Attribute,
     Interface,
     )
+from zope.interface.interfaces import IObjectEvent
 from zope.schema import (
     Choice,
     Datetime,
diff --git a/lib/lp/registry/model/person.py b/lib/lp/registry/model/person.py
index 0d4f5f9..4d0dcdc 100644
--- a/lib/lp/registry/model/person.py
+++ b/lib/lp/registry/model/person.py
@@ -84,13 +84,13 @@ from zope.component import (
     adapter,
     getUtility,
     )
-from zope.component.interfaces import ComponentLookupError
 from zope.event import notify
 from zope.interface import (
     alsoProvides,
     classImplements,
     implementer,
     )
+from zope.interface.interfaces import ComponentLookupError
 from zope.lifecycleevent import ObjectCreatedEvent
 from zope.publisher.interfaces import Unauthorized
 from zope.security.checker import (
diff --git a/lib/lp/scripts/utilities/importpedant.py b/lib/lp/scripts/utilities/importpedant.py
index de1c5d8..695f647 100644
--- a/lib/lp/scripts/utilities/importpedant.py
+++ b/lib/lp/scripts/utilities/importpedant.py
@@ -35,13 +35,17 @@ valid_imports_not_in_all = {
     'twisted.web.client': set(['BrowserLikePolicyForHTTPS']),
     'zope.component': set(
         ['adapter',
-         'ComponentLookupError',
          'provideAdapter',
          'provideHandler',
          ]),
-    # XXX cjwatson 2020-04-12: Fixed in zope.interface 5.1.0; remove this
-    # when we upgrade to that version.
-    'zope.interface': set(['invariant']),
+    # https://github.com/zopefoundation/zope.interface/pull/248
+    'zope.interface.interfaces': {
+        'ComponentLookupError',
+        'Invalid',
+        'ObjectEvent',
+        'Registered',
+        'Unregistered',
+        },
     }
 
 
diff --git a/lib/lp/services/authserver/xmlrpc.py b/lib/lp/services/authserver/xmlrpc.py
index 4696ac0..dbee3e9 100644
--- a/lib/lp/services/authserver/xmlrpc.py
+++ b/lib/lp/services/authserver/xmlrpc.py
@@ -10,11 +10,9 @@ __all__ = [
 
 from pymacaroons import Macaroon
 from storm.sqlobject import SQLObjectNotFound
-from zope.component import (
-    ComponentLookupError,
-    getUtility,
-    )
+from zope.component import getUtility
 from zope.interface import implementer
+from zope.interface.interfaces import ComponentLookupError
 from zope.security.proxy import removeSecurityProxy
 
 from lp.oci.interfaces.ocirecipebuild import IOCIRecipeBuildSet
diff --git a/lib/lp/services/identity/adapters/account.py b/lib/lp/services/identity/adapters/account.py
index 48e02bc..558a0e7 100644
--- a/lib/lp/services/identity/adapters/account.py
+++ b/lib/lp/services/identity/adapters/account.py
@@ -3,7 +3,7 @@
 
 """Components related to accounts."""
 
-from zope.component.interfaces import ComponentLookupError
+from zope.interface.interfaces import ComponentLookupError
 
 from lp.services.webapp.interfaces import ILaunchpadPrincipal
 
diff --git a/lib/lp/services/webapp/errorlog.py b/lib/lp/services/webapp/errorlog.py
index 8b17ef1..a6838bd 100644
--- a/lib/lp/services/webapp/errorlog.py
+++ b/lib/lp/services/webapp/errorlog.py
@@ -21,11 +21,11 @@ import six
 from six.moves.urllib.parse import urlparse
 from talisker.logs import logging_context
 from zope.component import getUtility
-from zope.component.interfaces import ObjectEvent
 from zope.error.interfaces import IErrorReportingUtility
 from zope.event import notify
 from zope.exceptions.exceptionformatter import format_exception
 from zope.interface import implementer
+from zope.interface.interfaces import ObjectEvent
 from zope.publisher.interfaces.xmlrpc import IXMLRPCRequest
 from zope.traversing.namespace import view
 
diff --git a/lib/lp/services/webapp/interfaces.py b/lib/lp/services/webapp/interfaces.py
index a895808..f9f1c7b 100644
--- a/lib/lp/services/webapp/interfaces.py
+++ b/lib/lp/services/webapp/interfaces.py
@@ -14,12 +14,12 @@ from zope.authentication.interfaces import (
     IPrincipal,
     IPrincipalSource,
     )
-from zope.component.interfaces import IObjectEvent
 from zope.interface import (
     Attribute,
     implementer,
     Interface,
     )
+from zope.interface.interfaces import IObjectEvent
 from zope.publisher.interfaces.browser import IBrowserApplicationRequest
 from zope.schema import (
     Bool,
diff --git a/lib/lp/services/webapp/publisher.py b/lib/lp/services/webapp/publisher.py
index 8b0761b..bba5b8c 100644
--- a/lib/lp/services/webapp/publisher.py
+++ b/lib/lp/services/webapp/publisher.py
@@ -47,11 +47,11 @@ from zope.component import (
     getUtility,
     queryMultiAdapter,
     )
-from zope.component.interfaces import ComponentLookupError
 from zope.interface import (
     directlyProvides,
     implementer,
     )
+from zope.interface.interfaces import ComponentLookupError
 from zope.publisher.defaultview import getDefaultViewName
 from zope.publisher.interfaces import NotFound
 from zope.publisher.interfaces.browser import (
diff --git a/lib/lp/services/webapp/tests/test_navigation.py b/lib/lp/services/webapp/tests/test_navigation.py
index b22aa80..c62f739 100644
--- a/lib/lp/services/webapp/tests/test_navigation.py
+++ b/lib/lp/services/webapp/tests/test_navigation.py
@@ -1,15 +1,13 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from zope.component import (
-    ComponentLookupError,
-    getMultiAdapter,
-    )
+from zope.component import getMultiAdapter
 from zope.configuration import xmlconfig
 from zope.interface import (
     implementer,
     Interface,
     )
+from zope.interface.interfaces import ComponentLookupError
 from zope.publisher.interfaces.browser import (
     IBrowserPublisher,
     IDefaultBrowserLayer,
diff --git a/lib/lp/snappy/interfaces/snapbuild.py b/lib/lp/snappy/interfaces/snapbuild.py
index 1d7c050..6d41fbe 100644
--- a/lib/lp/snappy/interfaces/snapbuild.py
+++ b/lib/lp/snappy/interfaces/snapbuild.py
@@ -31,11 +31,11 @@ from lazr.restful.fields import (
     CollectionField,
     Reference,
     )
-from zope.component.interfaces import IObjectEvent
 from zope.interface import (
     Attribute,
     Interface,
     )
+from zope.interface.interfaces import IObjectEvent
 from zope.schema import (
     Bool,
     Choice,
diff --git a/lib/lp/snappy/interfaces/snapbuildjob.py b/lib/lp/snappy/interfaces/snapbuildjob.py
index 5d11626..456e061 100644
--- a/lib/lp/snappy/interfaces/snapbuildjob.py
+++ b/lib/lp/snappy/interfaces/snapbuildjob.py
@@ -11,11 +11,11 @@ __all__ = [
     ]
 
 from lazr.restful.fields import Reference
-from zope.component.interfaces import IObjectEvent
 from zope.interface import (
     Attribute,
     Interface,
     )
+from zope.interface.interfaces import IObjectEvent
 from zope.schema import (
     Int,
     TextLine,
diff --git a/lib/lp/snappy/model/snapbuild.py b/lib/lp/snappy/model/snapbuild.py
index 125baed..31955e9 100644
--- a/lib/lp/snappy/model/snapbuild.py
+++ b/lib/lp/snappy/model/snapbuild.py
@@ -33,9 +33,9 @@ from storm.locals import (
     )
 from storm.store import EmptyResultSet
 from zope.component import getUtility
-from zope.component.interfaces import ObjectEvent
 from zope.event import notify
 from zope.interface import implementer
+from zope.interface.interfaces import ObjectEvent
 from zope.security.proxy import removeSecurityProxy
 
 from lp.app.errors import NotFoundError
diff --git a/lib/lp/snappy/model/snapbuildjob.py b/lib/lp/snappy/model/snapbuildjob.py
index 4c522e1..35b9e9e 100644
--- a/lib/lp/snappy/model/snapbuildjob.py
+++ b/lib/lp/snappy/model/snapbuildjob.py
@@ -24,12 +24,12 @@ from storm.locals import (
     )
 import transaction
 from zope.component import getUtility
-from zope.component.interfaces import ObjectEvent
 from zope.event import notify
 from zope.interface import (
     implementer,
     provider,
     )
+from zope.interface.interfaces import ObjectEvent
 
 from lp.app.errors import NotFoundError
 from lp.services.config import config
diff --git a/lib/lp/soyuz/xmlrpc/archive.py b/lib/lp/soyuz/xmlrpc/archive.py
index 1a3fbbc..8b7aa65 100644
--- a/lib/lp/soyuz/xmlrpc/archive.py
+++ b/lib/lp/soyuz/xmlrpc/archive.py
@@ -10,11 +10,9 @@ __all__ = [
 import logging
 
 from pymacaroons import Macaroon
-from zope.component import (
-    ComponentLookupError,
-    getUtility,
-    )
+from zope.component import getUtility
 from zope.interface import implementer
+from zope.interface.interfaces import ComponentLookupError
 from zope.security.proxy import removeSecurityProxy
 
 from lp.services.macaroons.interfaces import (
diff --git a/lib/lp/testing/__init__.py b/lib/lp/testing/__init__.py
index 433b3fb..db384ae 100644
--- a/lib/lp/testing/__init__.py
+++ b/lib/lp/testing/__init__.py
@@ -96,13 +96,13 @@ from testtools.matchers import (
 from testtools.testcase import ExpectedException as TTExpectedException
 import transaction
 from zope.component import (
-    ComponentLookupError,
     getMultiAdapter,
     getSiteManager,
     getUtility,
     )
 import zope.event
 from zope.interface import Interface
+from zope.interface.interfaces import ComponentLookupError
 from zope.interface.verify import verifyObject as zope_verifyObject
 from zope.publisher.interfaces import IEndRequestEvent
 from zope.publisher.interfaces.browser import IBrowserRequest
diff --git a/lib/lp/testing/factory.py b/lib/lp/testing/factory.py
index 684661f..8838ae7 100644
--- a/lib/lp/testing/factory.py
+++ b/lib/lp/testing/factory.py
@@ -57,10 +57,8 @@ from twisted.conch.ssh.common import (
     )
 from twisted.conch.test import keydata
 from twisted.python.util import mergeFunctionMetadata
-from zope.component import (
-    ComponentLookupError,
-    getUtility,
-    )
+from zope.component import getUtility
+from zope.interface.interfaces import ComponentLookupError
 from zope.security.proxy import (
     Proxy,
     ProxyFactory,
diff --git a/lib/lp/testing/layers.py b/lib/lp/testing/layers.py
index 632a255..4281642 100644
--- a/lib/lp/testing/layers.py
+++ b/lib/lp/testing/layers.py
@@ -89,9 +89,9 @@ from zope.component import (
     globalregistry,
     provideUtility,
     )
-from zope.component.interfaces import ComponentLookupError
 from zope.component.testlayer import ZCMLFileLayer
 from zope.event import notify
+from zope.interface.interfaces import ComponentLookupError
 from zope.processlifetime import DatabaseOpened
 from zope.security.management import (
     endInteraction,
diff --git a/lib/lp/testing/tests/test_fixture.py b/lib/lp/testing/tests/test_fixture.py
index 2fff09a..f8592c7 100644
--- a/lib/lp/testing/tests/test_fixture.py
+++ b/lib/lp/testing/tests/test_fixture.py
@@ -11,7 +11,6 @@ from storm.exceptions import DisconnectionError
 import transaction
 from zope.component import (
     adapter,
-    ComponentLookupError,
     getGlobalSiteManager,
     queryAdapter,
     )
@@ -19,6 +18,7 @@ from zope.interface import (
     implementer,
     Interface,
     )
+from zope.interface.interfaces import ComponentLookupError
 from zope.sendmail.interfaces import IMailDelivery
 
 from lp.registry.model.person import Person
diff --git a/lib/lp/testing/tests/test_layers_functional.py b/lib/lp/testing/tests/test_layers_functional.py
index 1802061..61fac46 100644
--- a/lib/lp/testing/tests/test_layers_functional.py
+++ b/lib/lp/testing/tests/test_layers_functional.py
@@ -21,10 +21,8 @@ from fixtures import (
 import six
 from six.moves.urllib.error import HTTPError
 from six.moves.urllib.request import urlopen
-from zope.component import (
-    ComponentLookupError,
-    getUtility,
-    )
+from zope.component import getUtility
+from zope.interface.interfaces import ComponentLookupError
 
 from lp.services.config import config
 from lp.services.librarian.client import (