Merge ~cjwatson/launchpad:unused-imports into launchpad:master

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 891532d674bf6a18763773b328e86f49b85eb409
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:unused-imports
Merge into: launchpad:master
Diff against target: 170 lines (+1/-19)
13 files modified
cronscripts/process-job-source-groups.py (+0/-1)
lib/lp/bugs/mail/bugnotificationbuilder.py (+0/-2)
lib/lp/code/browser/tests/test_branch.py (+0/-1)
lib/lp/registry/browser/person.py (+0/-1)
lib/lp/registry/tests/test_distributionmirror.py (+0/-1)
lib/lp/registry/tests/test_ociprojectname.py (+1/-5)
lib/lp/services/database/tests/script_isolation.py (+0/-2)
lib/lp/services/webapp/authentication.py (+0/-1)
lib/lp/soyuz/browser/tests/test_distroarchseries_webservice.py (+0/-1)
lib/lp/soyuz/model/queue.py (+0/-1)
lib/lp/testing/swift/fakeswift.py (+0/-1)
lib/lp/testing/swift/tests/test_fixture.py (+0/-1)
utilities/findimports.py (+0/-1)
Reviewer Review Type Date Requested Status
Cristian Gonzalez (community) Approve
Review via email: mp+399329@code.launchpad.net

Commit message

Remove various unused imports

To post a comment you must log in.
Revision history for this message
Cristian Gonzalez (cristiangsp) wrote :

Nice clean up!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/cronscripts/process-job-source-groups.py b/cronscripts/process-job-source-groups.py
2index 01ab9a7..8d10901 100755
3--- a/cronscripts/process-job-source-groups.py
4+++ b/cronscripts/process-job-source-groups.py
5@@ -19,7 +19,6 @@ from lp.services.config import config
6 from lp.services.helpers import english_list
7 from lp.services.propertycache import cachedproperty
8 from lp.services.scripts.base import LaunchpadCronScript
9-from lp.services.job.scripts.process_job_source import ProcessJobSource
10
11
12 class LongEpilogHelpFormatter(IndentedHelpFormatter):
13diff --git a/lib/lp/bugs/mail/bugnotificationbuilder.py b/lib/lp/bugs/mail/bugnotificationbuilder.py
14index 0846bb7..e525806 100644
15--- a/lib/lp/bugs/mail/bugnotificationbuilder.py
16+++ b/lib/lp/bugs/mail/bugnotificationbuilder.py
17@@ -27,8 +27,6 @@ from lp.app.enums import (
18 )
19 from lp.app.interfaces.launchpad import ILaunchpadCelebrities
20 from lp.services.config import config
21-from lp.services.helpers import shortlist
22-from lp.services.identity.interfaces.emailaddress import IEmailAddressSet
23 from lp.services.mail.sendmail import (
24 append_footer,
25 format_address,
26diff --git a/lib/lp/code/browser/tests/test_branch.py b/lib/lp/code/browser/tests/test_branch.py
27index cb2ea66..b731ac7 100644
28--- a/lib/lp/code/browser/tests/test_branch.py
29+++ b/lib/lp/code/browser/tests/test_branch.py
30@@ -12,7 +12,6 @@ from textwrap import dedent
31
32 from fixtures import FakeLogger
33 import pytz
34-from six.moves.urllib_error import HTTPError
35 from storm.store import Store
36 from testtools.matchers import Equals
37 from zope.component import getUtility
38diff --git a/lib/lp/registry/browser/person.py b/lib/lp/registry/browser/person.py
39index 31c29ed..8311bd1 100644
40--- a/lib/lp/registry/browser/person.py
41+++ b/lib/lp/registry/browser/person.py
42@@ -192,7 +192,6 @@ from lp.registry.interfaces.product import (
43 InvalidProductName,
44 IProduct,
45 )
46-from lp.registry.interfaces.role import IPersonRoles
47 from lp.registry.interfaces.ssh import (
48 ISSHKeySet,
49 SSHKeyAdditionError,
50diff --git a/lib/lp/registry/tests/test_distributionmirror.py b/lib/lp/registry/tests/test_distributionmirror.py
51index e2fcc36..bbe025d 100644
52--- a/lib/lp/registry/tests/test_distributionmirror.py
53+++ b/lib/lp/registry/tests/test_distributionmirror.py
54@@ -20,7 +20,6 @@ from lp.registry.interfaces.pocket import PackagePublishingPocket
55 from lp.registry.model.distributionmirror import DistributionMirror
56 from lp.services.database.sqlbase import flush_database_updates
57 from lp.services.mail import stub
58-from lp.services.webapp.authorization import check_permission
59 from lp.services.worlddata.interfaces.country import ICountrySet
60 from lp.testing import (
61 login,
62diff --git a/lib/lp/registry/tests/test_ociprojectname.py b/lib/lp/registry/tests/test_ociprojectname.py
63index 99d14bb..09411f5 100644
64--- a/lib/lp/registry/tests/test_ociprojectname.py
65+++ b/lib/lp/registry/tests/test_ociprojectname.py
66@@ -7,7 +7,6 @@ from __future__ import absolute_import, print_function, unicode_literals
67
68 __metaclass__ = type
69
70-from testtools.testcase import ExpectedException
71 from zope.component import getUtility
72
73 from lp.registry.errors import (
74@@ -22,10 +21,7 @@ from lp.registry.model.ociprojectname import (
75 OCIProjectName,
76 OCIProjectNameSet,
77 )
78-from lp.testing import (
79- admin_logged_in,
80- TestCaseWithFactory,
81- )
82+from lp.testing import TestCaseWithFactory
83 from lp.testing.layers import DatabaseFunctionalLayer
84
85
86diff --git a/lib/lp/services/database/tests/script_isolation.py b/lib/lp/services/database/tests/script_isolation.py
87index 6f9843b..9857c13 100644
88--- a/lib/lp/services/database/tests/script_isolation.py
89+++ b/lib/lp/services/database/tests/script_isolation.py
90@@ -10,8 +10,6 @@ from __future__ import absolute_import, print_function
91 __metaclass__ = type
92 __all__ = []
93
94-import warnings
95-
96 import transaction
97
98 from lp.services.config import dbconfig
99diff --git a/lib/lp/services/webapp/authentication.py b/lib/lp/services/webapp/authentication.py
100index c778407..01e5e53 100644
101--- a/lib/lp/services/webapp/authentication.py
102+++ b/lib/lp/services/webapp/authentication.py
103@@ -15,7 +15,6 @@ __all__ = [
104 import binascii
105
106 from oauthlib import oauth1
107-from oauthlib.oauth1.rfc5849.utils import parse_authorization_header
108 import six
109 from zope.authentication.interfaces import ILoginPassword
110 from zope.component import getUtility
111diff --git a/lib/lp/soyuz/browser/tests/test_distroarchseries_webservice.py b/lib/lp/soyuz/browser/tests/test_distroarchseries_webservice.py
112index 2a89f35..4555f60 100644
113--- a/lib/lp/soyuz/browser/tests/test_distroarchseries_webservice.py
114+++ b/lib/lp/soyuz/browser/tests/test_distroarchseries_webservice.py
115@@ -23,7 +23,6 @@ from lp.buildmaster.enums import BuildBaseImageType
116 from lp.registry.enums import PersonVisibility
117 from lp.registry.interfaces.pocket import PackagePublishingPocket
118 from lp.services.features.testing import FeatureFixture
119-from lp.soyuz.enums import DistroArchSeriesFilterSense
120 from lp.soyuz.interfaces.livefs import LIVEFS_FEATURE_FLAG
121 from lp.testing import (
122 api_url,
123diff --git a/lib/lp/soyuz/model/queue.py b/lib/lp/soyuz/model/queue.py
124index 9fdfb5f..712acfb 100644
125--- a/lib/lp/soyuz/model/queue.py
126+++ b/lib/lp/soyuz/model/queue.py
127@@ -76,7 +76,6 @@ from lp.services.database.stormexpr import (
128 Array,
129 ArrayContains,
130 )
131-from lp.services.features import getFeatureFlag
132 from lp.services.librarian.browser import ProxiedLibraryFileAlias
133 from lp.services.librarian.model import (
134 LibraryFileAlias,
135diff --git a/lib/lp/testing/swift/fakeswift.py b/lib/lp/testing/swift/fakeswift.py
136index 3536326..2039e74 100644
137--- a/lib/lp/testing/swift/fakeswift.py
138+++ b/lib/lp/testing/swift/fakeswift.py
139@@ -18,7 +18,6 @@ import io
140 import json
141 import logging
142 import os.path
143-import sys
144 import time
145 import uuid
146
147diff --git a/lib/lp/testing/swift/tests/test_fixture.py b/lib/lp/testing/swift/tests/test_fixture.py
148index b03507f..2fbc3eb 100644
149--- a/lib/lp/testing/swift/tests/test_fixture.py
150+++ b/lib/lp/testing/swift/tests/test_fixture.py
151@@ -11,7 +11,6 @@ from hashlib import md5
152
153 from requests.exceptions import ConnectionError
154 from swiftclient import client as swiftclient
155-from swiftclient.exceptions import ClientException
156 from testtools.matchers import (
157 GreaterThan,
158 LessThan,
159diff --git a/utilities/findimports.py b/utilities/findimports.py
160index 09e0cf1..90367ed 100755
161--- a/utilities/findimports.py
162+++ b/utilities/findimports.py
163@@ -39,7 +39,6 @@ Ave, Cambridge, MA 02139, USA.
164 from __future__ import absolute_import, print_function
165
166 import compiler
167-from compiler import ast
168 from compiler.visitor import ASTVisitor
169 import getopt
170 import linecache

Subscribers

People subscribed via source and target branches

to status/vote changes: