Launchpad itself

Merge lp:~sinzui/launchpad/import-person into lp:launchpad

  1. import-person
  2. Merge into devel
Proposed by Curtis Hovey
Status: Merged
Approved by: Aaron Bentley
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~sinzui/launchpad/import-person
Merge into: lp:launchpad
Diff against target: 234 lines
4 files modified
lib/canonical/launchpad/database/__init__.py (+0/-2)
lib/canonical/launchpad/doc/hwdb-device-tables.txt (+1/-1)
lib/canonical/launchpad/zcml/hwdb.zcml (+23/-23)
lib/canonical/launchpad/zcml/launchpadstatistic.zcml (+3/-3)
To merge this branch: bzr merge lp:~sinzui/launchpad/import-person
Reviewer Review Type Date Requested Status
Aaron Bentley (community) Approve
Review via email: mp+12060@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Curtis Hovey (sinzui) wrote :

This is my branch to fix imports.

    lp:~sinzui/launchpad/import-person
    Diff size: 45
    Launchpad bug: https://bugs.launchpad.net/bugs/import-person
    Test command: ./bin/py -c 'from lp.registry.model
    Pre-implementation: no one. I fixed it as I was triaging the bug
    Target release: 3.1.0

= Fix imports =

./bin/py -c 'from lp.registry.model import person' fails due to circular import

== Rules ==

While trying to understand the scope of the bug I realised the problem was
in one of the unmigrated apps. After I fixed it, I searched for and fixed
all the locations that imported from database.

== Lint ==

Linting changed files:
  lib/canonical/launchpad/database/__init__.py
  lib/canonical/launchpad/doc/hwdb-device-tables.txt
  lib/canonical/launchpad/zcml/launchpadstatistic.zcml

== Test ==

    * lib/canonical/launchpad/doc/hwdb-device-tables.txt
      * Fixed the import in the test.

== Implementation ==

    * lib/canonical/launchpad/database/__init__.py
      * Removed the unneeded import
    * lib/canonical/launchpad/zcml/launchpadstatistic.zcml
      * Fixed the import in ZCML.

Revision history for this message
Aaron Bentley (abentley) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/launchpad/database/__init__.py'
2--- lib/canonical/launchpad/database/__init__.py 2009-08-27 07:05:16 +0000
3+++ lib/canonical/launchpad/database/__init__.py 2009-09-29 02:05:39 +0000
4@@ -58,7 +58,6 @@
5 from canonical.launchpad.database.personnotification import *
6 from canonical.launchpad.database.packaging import *
7 from canonical.launchpad.database.librarian import *
8-from canonical.launchpad.database.launchpadstatistic import *
9 from canonical.launchpad.database.binaryandsourcepackagename import *
10 from canonical.launchpad.database.message import *
11 from canonical.launchpad.database.structuralsubscription import *
12@@ -66,4 +65,3 @@
13 from canonical.launchpad.database.temporaryblobstorage import *
14 from canonical.launchpad.database.emailaddress import *
15 from canonical.launchpad.database.oauth import *
16-from canonical.launchpad.database.hwdb import *
17
18=== modified file 'lib/canonical/launchpad/doc/hwdb-device-tables.txt'
19--- lib/canonical/launchpad/doc/hwdb-device-tables.txt 2009-08-14 13:03:36 +0000
20+++ lib/canonical/launchpad/doc/hwdb-device-tables.txt 2009-09-29 02:05:39 +0000
21@@ -1486,7 +1486,7 @@
22 names. Note that the package name value None (used in older submissions)
23 is not included.
24
25- >>> from canonical.launchpad.database import HWDriver
26+ >>> from canonical.launchpad.database.hwdb import HWDriver
27 >>> store.add(HWDriver(name='foo', package_name=None))
28 <HWDriver at...
29 >>> for package_name in driver_set.all_package_names():
30
31=== modified file 'lib/canonical/launchpad/zcml/hwdb.zcml'
32--- lib/canonical/launchpad/zcml/hwdb.zcml 2009-08-14 13:03:36 +0000
33+++ lib/canonical/launchpad/zcml/hwdb.zcml 2009-09-29 02:05:39 +0000
34@@ -44,7 +44,7 @@
35 template="../templates/hwdb-submit-hardware-data.pt"
36 />
37
38- <class class="canonical.launchpad.database.HWSubmission">
39+ <class class="canonical.launchpad.database.hwdb.HWSubmission">
40 <require
41 permission="launchpad.View"
42 interface="canonical.launchpad.interfaces.IHWSubmission"
43@@ -78,18 +78,18 @@
44 />
45
46 <securedutility
47- class="canonical.launchpad.database.HWSubmissionSet"
48+ class="canonical.launchpad.database.hwdb.HWSubmissionSet"
49 provides="canonical.launchpad.interfaces.IHWSubmissionSet">
50 <allow interface="canonical.launchpad.interfaces.IHWSubmissionSet" />
51 </securedutility>
52
53- <class class="canonical.launchpad.database.HWSystemFingerprint">
54+ <class class="canonical.launchpad.database.hwdb.HWSystemFingerprint">
55 <allow
56 interface="canonical.launchpad.interfaces.IHWSystemFingerprint" />
57 </class>
58
59 <securedutility
60- class="canonical.launchpad.database.HWSystemFingerprintSet"
61+ class="canonical.launchpad.database.hwdb.HWSystemFingerprintSet"
62 provides="canonical.launchpad.interfaces.IHWSystemFingerprintSet">
63 <allow
64 interface="canonical.launchpad.interfaces.IHWSystemFingerprintSet" />
65@@ -109,18 +109,18 @@
66 <allow attributes="__call__" />
67 </class>
68
69- <class class="canonical.launchpad.database.HWVendorName">
70+ <class class="canonical.launchpad.database.hwdb.HWVendorName">
71 <allow interface="canonical.launchpad.interfaces.IHWVendorName" />
72 <allow attributes="id" />
73 </class>
74
75 <securedutility
76- class="canonical.launchpad.database.HWVendorNameSet"
77+ class="canonical.launchpad.database.hwdb.HWVendorNameSet"
78 provides="canonical.launchpad.interfaces.IHWVendorNameSet">
79 <allow interface="canonical.launchpad.interfaces.IHWVendorNameSet" />
80 </securedutility>
81
82- <class class="canonical.launchpad.database.HWVendorID">
83+ <class class="canonical.launchpad.database.hwdb.HWVendorID">
84 <require
85 permission="launchpad.View"
86 interface="canonical.launchpad.interfaces.IHWVendorID" />
87@@ -133,12 +133,12 @@
88 />
89
90 <securedutility
91- class="canonical.launchpad.database.HWVendorIDSet"
92+ class="canonical.launchpad.database.hwdb.HWVendorIDSet"
93 provides="canonical.launchpad.interfaces.IHWVendorIDSet">
94 <allow interface="canonical.launchpad.interfaces.IHWVendorIDSet" />
95 </securedutility>
96
97- <class class="canonical.launchpad.database.HWDevice">
98+ <class class="canonical.launchpad.database.hwdb.HWDevice">
99 <require
100 permission="launchpad.View"
101 interface="canonical.launchpad.interfaces.IHWDevice" />
102@@ -151,24 +151,24 @@
103 />
104
105 <securedutility
106- class="canonical.launchpad.database.HWDeviceSet"
107+ class="canonical.launchpad.database.hwdb.HWDeviceSet"
108 provides="canonical.launchpad.interfaces.IHWDeviceSet">
109 <allow interface="canonical.launchpad.interfaces.IHWDeviceSet" />
110 </securedutility>
111
112- <class class="canonical.launchpad.database.HWDeviceNameVariant">
113+ <class class="canonical.launchpad.database.hwdb.HWDeviceNameVariant">
114 <allow interface=
115 "canonical.launchpad.interfaces.IHWDeviceNameVariant" />
116 </class>
117
118 <securedutility
119- class="canonical.launchpad.database.HWDeviceNameVariantSet"
120+ class="canonical.launchpad.database.hwdb.HWDeviceNameVariantSet"
121 provides="canonical.launchpad.interfaces.IHWDeviceNameVariantSet">
122 <allow interface=
123 "canonical.launchpad.interfaces.IHWDeviceNameVariantSet" />
124 </securedutility>
125
126- <class class="canonical.launchpad.database.HWDriver">
127+ <class class="canonical.launchpad.database.hwdb.HWDriver">
128 <require
129 permission="launchpad.View"
130 interface="canonical.launchpad.interfaces.IHWDriver" />
131@@ -181,13 +181,13 @@
132 />
133
134 <securedutility
135- class="canonical.launchpad.database.HWDriverSet"
136+ class="canonical.launchpad.database.hwdb.HWDriverSet"
137 provides="canonical.launchpad.interfaces.IHWDriverSet">
138 <allow
139 interface="canonical.launchpad.interfaces.IHWDriverSet" />
140 </securedutility>
141
142- <class class="canonical.launchpad.database.HWDriverName">
143+ <class class="canonical.launchpad.database.hwdb.HWDriverName">
144 <require
145 permission="launchpad.View"
146 interface="canonical.launchpad.interfaces.IHWDriverName" />
147@@ -199,7 +199,7 @@
148 parent_utility="canonical.launchpad.interfaces.IHWDBApplication"
149 />
150
151- <class class="canonical.launchpad.database.HWDriverPackageName">
152+ <class class="canonical.launchpad.database.hwdb.HWDriverPackageName">
153 <require
154 permission="launchpad.View"
155 interface="canonical.launchpad.interfaces.IHWDriverPackageName" />
156@@ -211,20 +211,20 @@
157 parent_utility="canonical.launchpad.interfaces.IHWDBApplication"
158 />
159
160- <class class="canonical.launchpad.database.HWDeviceDriverLink">
161+ <class class="canonical.launchpad.database.hwdb.HWDeviceDriverLink">
162 <allow
163 interface="canonical.launchpad.interfaces.IHWDeviceDriverLink" />
164 <allow attributes="id" />
165 </class>
166
167 <securedutility
168- class="canonical.launchpad.database.HWDeviceDriverLinkSet"
169+ class="canonical.launchpad.database.hwdb.HWDeviceDriverLinkSet"
170 provides="canonical.launchpad.interfaces.IHWDeviceDriverLinkSet">
171 <allow
172 interface="canonical.launchpad.interfaces.IHWDeviceDriverLinkSet" />
173 </securedutility>
174
175- <class class="canonical.launchpad.database.HWDeviceClass">
176+ <class class="canonical.launchpad.database.hwdb.HWDeviceClass">
177 <require permission="launchpad.View"
178 interface="canonical.launchpad.interfaces.IHWDeviceClass" />
179 </class>
180@@ -242,7 +242,7 @@
181 interface="canonical.launchpad.interfaces.IHWDeviceClassSet" />
182 </securedutility>
183
184- <class class="canonical.launchpad.database.HWSubmissionDevice">
185+ <class class="canonical.launchpad.database.hwdb.HWSubmissionDevice">
186 <require
187 permission="launchpad.View"
188 interface="canonical.launchpad.interfaces.IHWSubmissionDevice" />
189@@ -255,20 +255,20 @@
190 />
191
192 <securedutility
193- class="canonical.launchpad.database.HWSubmissionDeviceSet"
194+ class="canonical.launchpad.database.hwdb.HWSubmissionDeviceSet"
195 provides="canonical.launchpad.interfaces.IHWSubmissionDeviceSet">
196 <allow
197 interface="canonical.launchpad.interfaces.IHWSubmissionDeviceSet" />
198 </securedutility>
199
200- <class class="canonical.launchpad.database.HWSubmissionBug">
201+ <class class="canonical.launchpad.database.hwdb.HWSubmissionBug">
202 <allow
203 interface="canonical.launchpad.interfaces.IHWSubmissionBug" />
204 <allow attributes="id" />
205 </class>
206
207 <securedutility
208- class="canonical.launchpad.database.HWSubmissionBugSet"
209+ class="canonical.launchpad.database.hwdb.HWSubmissionBugSet"
210 provides="canonical.launchpad.interfaces.IHWSubmissionBugSet">
211 <allow
212 interface="canonical.launchpad.interfaces.IHWSubmissionBugSet" />
213
214=== modified file 'lib/canonical/launchpad/zcml/launchpadstatistic.zcml'
215--- lib/canonical/launchpad/zcml/launchpadstatistic.zcml 2009-09-18 13:24:29 +0000
216+++ lib/canonical/launchpad/zcml/launchpadstatistic.zcml 2009-09-29 02:05:39 +0000
217@@ -9,14 +9,14 @@
218 i18n_domain="launchpad">
219
220 <!-- LaunchpadStatistic -->
221- <class class="canonical.launchpad.database.LaunchpadStatistic">
222- <allow interface="canonical.launchpad.interfaces.ILaunchpadStatistic" />
223+ <class class="canonical.launchpad.database.launchpadstatistic.LaunchpadStatistic">
224+ <allow interface="canonical.launchpad.interfaces.launchpadstatistic.ILaunchpadStatistic" />
225 </class>
226
227
228 <!-- LaunchpadStatisticSet -->
229 <securedutility
230- class="canonical.launchpad.database.LaunchpadStatisticSet"
231+ class="canonical.launchpad.database.launchpadstatistic.LaunchpadStatisticSet"
232 provides="canonical.launchpad.interfaces.ILaunchpadStatisticSet">
233 <allow interface="canonical.launchpad.interfaces.ILaunchpadStatisticSet" />
234 </securedutility>