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
=== modified file 'lib/canonical/launchpad/database/__init__.py'
--- lib/canonical/launchpad/database/__init__.py 2009-08-27 07:05:16 +0000
+++ lib/canonical/launchpad/database/__init__.py 2009-09-29 02:05:39 +0000
@@ -58,7 +58,6 @@
58from canonical.launchpad.database.personnotification import *58from canonical.launchpad.database.personnotification import *
59from canonical.launchpad.database.packaging import *59from canonical.launchpad.database.packaging import *
60from canonical.launchpad.database.librarian import *60from canonical.launchpad.database.librarian import *
61from canonical.launchpad.database.launchpadstatistic import *
62from canonical.launchpad.database.binaryandsourcepackagename import *61from canonical.launchpad.database.binaryandsourcepackagename import *
63from canonical.launchpad.database.message import *62from canonical.launchpad.database.message import *
64from canonical.launchpad.database.structuralsubscription import *63from canonical.launchpad.database.structuralsubscription import *
@@ -66,4 +65,3 @@
66from canonical.launchpad.database.temporaryblobstorage import *65from canonical.launchpad.database.temporaryblobstorage import *
67from canonical.launchpad.database.emailaddress import *66from canonical.launchpad.database.emailaddress import *
68from canonical.launchpad.database.oauth import *67from canonical.launchpad.database.oauth import *
69from canonical.launchpad.database.hwdb import *
7068
=== modified file 'lib/canonical/launchpad/doc/hwdb-device-tables.txt'
--- lib/canonical/launchpad/doc/hwdb-device-tables.txt 2009-08-14 13:03:36 +0000
+++ lib/canonical/launchpad/doc/hwdb-device-tables.txt 2009-09-29 02:05:39 +0000
@@ -1486,7 +1486,7 @@
1486names. Note that the package name value None (used in older submissions)1486names. Note that the package name value None (used in older submissions)
1487is not included.1487is not included.
14881488
1489 >>> from canonical.launchpad.database import HWDriver1489 >>> from canonical.launchpad.database.hwdb import HWDriver
1490 >>> store.add(HWDriver(name='foo', package_name=None))1490 >>> store.add(HWDriver(name='foo', package_name=None))
1491 <HWDriver at...1491 <HWDriver at...
1492 >>> for package_name in driver_set.all_package_names():1492 >>> for package_name in driver_set.all_package_names():
14931493
=== modified file 'lib/canonical/launchpad/zcml/hwdb.zcml'
--- lib/canonical/launchpad/zcml/hwdb.zcml 2009-08-14 13:03:36 +0000
+++ lib/canonical/launchpad/zcml/hwdb.zcml 2009-09-29 02:05:39 +0000
@@ -44,7 +44,7 @@
44 template="../templates/hwdb-submit-hardware-data.pt"44 template="../templates/hwdb-submit-hardware-data.pt"
45 />45 />
4646
47 <class class="canonical.launchpad.database.HWSubmission">47 <class class="canonical.launchpad.database.hwdb.HWSubmission">
48 <require48 <require
49 permission="launchpad.View"49 permission="launchpad.View"
50 interface="canonical.launchpad.interfaces.IHWSubmission"50 interface="canonical.launchpad.interfaces.IHWSubmission"
@@ -78,18 +78,18 @@
78 />78 />
7979
80 <securedutility80 <securedutility
81 class="canonical.launchpad.database.HWSubmissionSet"81 class="canonical.launchpad.database.hwdb.HWSubmissionSet"
82 provides="canonical.launchpad.interfaces.IHWSubmissionSet">82 provides="canonical.launchpad.interfaces.IHWSubmissionSet">
83 <allow interface="canonical.launchpad.interfaces.IHWSubmissionSet" />83 <allow interface="canonical.launchpad.interfaces.IHWSubmissionSet" />
84 </securedutility>84 </securedutility>
8585
86 <class class="canonical.launchpad.database.HWSystemFingerprint">86 <class class="canonical.launchpad.database.hwdb.HWSystemFingerprint">
87 <allow87 <allow
88 interface="canonical.launchpad.interfaces.IHWSystemFingerprint" />88 interface="canonical.launchpad.interfaces.IHWSystemFingerprint" />
89 </class>89 </class>
9090
91 <securedutility91 <securedutility
92 class="canonical.launchpad.database.HWSystemFingerprintSet"92 class="canonical.launchpad.database.hwdb.HWSystemFingerprintSet"
93 provides="canonical.launchpad.interfaces.IHWSystemFingerprintSet">93 provides="canonical.launchpad.interfaces.IHWSystemFingerprintSet">
94 <allow94 <allow
95 interface="canonical.launchpad.interfaces.IHWSystemFingerprintSet" />95 interface="canonical.launchpad.interfaces.IHWSystemFingerprintSet" />
@@ -109,18 +109,18 @@
109 <allow attributes="__call__" />109 <allow attributes="__call__" />
110 </class>110 </class>
111111
112 <class class="canonical.launchpad.database.HWVendorName">112 <class class="canonical.launchpad.database.hwdb.HWVendorName">
113 <allow interface="canonical.launchpad.interfaces.IHWVendorName" />113 <allow interface="canonical.launchpad.interfaces.IHWVendorName" />
114 <allow attributes="id" />114 <allow attributes="id" />
115 </class>115 </class>
116116
117 <securedutility117 <securedutility
118 class="canonical.launchpad.database.HWVendorNameSet"118 class="canonical.launchpad.database.hwdb.HWVendorNameSet"
119 provides="canonical.launchpad.interfaces.IHWVendorNameSet">119 provides="canonical.launchpad.interfaces.IHWVendorNameSet">
120 <allow interface="canonical.launchpad.interfaces.IHWVendorNameSet" />120 <allow interface="canonical.launchpad.interfaces.IHWVendorNameSet" />
121 </securedutility>121 </securedutility>
122122
123 <class class="canonical.launchpad.database.HWVendorID">123 <class class="canonical.launchpad.database.hwdb.HWVendorID">
124 <require124 <require
125 permission="launchpad.View"125 permission="launchpad.View"
126 interface="canonical.launchpad.interfaces.IHWVendorID" />126 interface="canonical.launchpad.interfaces.IHWVendorID" />
@@ -133,12 +133,12 @@
133 />133 />
134134
135 <securedutility135 <securedutility
136 class="canonical.launchpad.database.HWVendorIDSet"136 class="canonical.launchpad.database.hwdb.HWVendorIDSet"
137 provides="canonical.launchpad.interfaces.IHWVendorIDSet">137 provides="canonical.launchpad.interfaces.IHWVendorIDSet">
138 <allow interface="canonical.launchpad.interfaces.IHWVendorIDSet" />138 <allow interface="canonical.launchpad.interfaces.IHWVendorIDSet" />
139 </securedutility>139 </securedutility>
140140
141 <class class="canonical.launchpad.database.HWDevice">141 <class class="canonical.launchpad.database.hwdb.HWDevice">
142 <require142 <require
143 permission="launchpad.View"143 permission="launchpad.View"
144 interface="canonical.launchpad.interfaces.IHWDevice" />144 interface="canonical.launchpad.interfaces.IHWDevice" />
@@ -151,24 +151,24 @@
151 />151 />
152152
153 <securedutility153 <securedutility
154 class="canonical.launchpad.database.HWDeviceSet"154 class="canonical.launchpad.database.hwdb.HWDeviceSet"
155 provides="canonical.launchpad.interfaces.IHWDeviceSet">155 provides="canonical.launchpad.interfaces.IHWDeviceSet">
156 <allow interface="canonical.launchpad.interfaces.IHWDeviceSet" />156 <allow interface="canonical.launchpad.interfaces.IHWDeviceSet" />
157 </securedutility>157 </securedutility>
158158
159 <class class="canonical.launchpad.database.HWDeviceNameVariant">159 <class class="canonical.launchpad.database.hwdb.HWDeviceNameVariant">
160 <allow interface=160 <allow interface=
161 "canonical.launchpad.interfaces.IHWDeviceNameVariant" />161 "canonical.launchpad.interfaces.IHWDeviceNameVariant" />
162 </class>162 </class>
163163
164 <securedutility164 <securedutility
165 class="canonical.launchpad.database.HWDeviceNameVariantSet"165 class="canonical.launchpad.database.hwdb.HWDeviceNameVariantSet"
166 provides="canonical.launchpad.interfaces.IHWDeviceNameVariantSet">166 provides="canonical.launchpad.interfaces.IHWDeviceNameVariantSet">
167 <allow interface=167 <allow interface=
168 "canonical.launchpad.interfaces.IHWDeviceNameVariantSet" />168 "canonical.launchpad.interfaces.IHWDeviceNameVariantSet" />
169 </securedutility>169 </securedutility>
170170
171 <class class="canonical.launchpad.database.HWDriver">171 <class class="canonical.launchpad.database.hwdb.HWDriver">
172 <require172 <require
173 permission="launchpad.View"173 permission="launchpad.View"
174 interface="canonical.launchpad.interfaces.IHWDriver" />174 interface="canonical.launchpad.interfaces.IHWDriver" />
@@ -181,13 +181,13 @@
181 />181 />
182182
183 <securedutility183 <securedutility
184 class="canonical.launchpad.database.HWDriverSet"184 class="canonical.launchpad.database.hwdb.HWDriverSet"
185 provides="canonical.launchpad.interfaces.IHWDriverSet">185 provides="canonical.launchpad.interfaces.IHWDriverSet">
186 <allow186 <allow
187 interface="canonical.launchpad.interfaces.IHWDriverSet" />187 interface="canonical.launchpad.interfaces.IHWDriverSet" />
188 </securedutility>188 </securedutility>
189189
190 <class class="canonical.launchpad.database.HWDriverName">190 <class class="canonical.launchpad.database.hwdb.HWDriverName">
191 <require191 <require
192 permission="launchpad.View"192 permission="launchpad.View"
193 interface="canonical.launchpad.interfaces.IHWDriverName" />193 interface="canonical.launchpad.interfaces.IHWDriverName" />
@@ -199,7 +199,7 @@
199 parent_utility="canonical.launchpad.interfaces.IHWDBApplication"199 parent_utility="canonical.launchpad.interfaces.IHWDBApplication"
200 />200 />
201201
202 <class class="canonical.launchpad.database.HWDriverPackageName">202 <class class="canonical.launchpad.database.hwdb.HWDriverPackageName">
203 <require203 <require
204 permission="launchpad.View"204 permission="launchpad.View"
205 interface="canonical.launchpad.interfaces.IHWDriverPackageName" />205 interface="canonical.launchpad.interfaces.IHWDriverPackageName" />
@@ -211,20 +211,20 @@
211 parent_utility="canonical.launchpad.interfaces.IHWDBApplication"211 parent_utility="canonical.launchpad.interfaces.IHWDBApplication"
212 />212 />
213213
214 <class class="canonical.launchpad.database.HWDeviceDriverLink">214 <class class="canonical.launchpad.database.hwdb.HWDeviceDriverLink">
215 <allow215 <allow
216 interface="canonical.launchpad.interfaces.IHWDeviceDriverLink" />216 interface="canonical.launchpad.interfaces.IHWDeviceDriverLink" />
217 <allow attributes="id" />217 <allow attributes="id" />
218 </class>218 </class>
219219
220 <securedutility220 <securedutility
221 class="canonical.launchpad.database.HWDeviceDriverLinkSet"221 class="canonical.launchpad.database.hwdb.HWDeviceDriverLinkSet"
222 provides="canonical.launchpad.interfaces.IHWDeviceDriverLinkSet">222 provides="canonical.launchpad.interfaces.IHWDeviceDriverLinkSet">
223 <allow223 <allow
224 interface="canonical.launchpad.interfaces.IHWDeviceDriverLinkSet" />224 interface="canonical.launchpad.interfaces.IHWDeviceDriverLinkSet" />
225 </securedutility>225 </securedutility>
226226
227 <class class="canonical.launchpad.database.HWDeviceClass">227 <class class="canonical.launchpad.database.hwdb.HWDeviceClass">
228 <require permission="launchpad.View"228 <require permission="launchpad.View"
229 interface="canonical.launchpad.interfaces.IHWDeviceClass" />229 interface="canonical.launchpad.interfaces.IHWDeviceClass" />
230 </class>230 </class>
@@ -242,7 +242,7 @@
242 interface="canonical.launchpad.interfaces.IHWDeviceClassSet" />242 interface="canonical.launchpad.interfaces.IHWDeviceClassSet" />
243 </securedutility>243 </securedutility>
244244
245 <class class="canonical.launchpad.database.HWSubmissionDevice">245 <class class="canonical.launchpad.database.hwdb.HWSubmissionDevice">
246 <require246 <require
247 permission="launchpad.View"247 permission="launchpad.View"
248 interface="canonical.launchpad.interfaces.IHWSubmissionDevice" />248 interface="canonical.launchpad.interfaces.IHWSubmissionDevice" />
@@ -255,20 +255,20 @@
255 />255 />
256256
257 <securedutility257 <securedutility
258 class="canonical.launchpad.database.HWSubmissionDeviceSet"258 class="canonical.launchpad.database.hwdb.HWSubmissionDeviceSet"
259 provides="canonical.launchpad.interfaces.IHWSubmissionDeviceSet">259 provides="canonical.launchpad.interfaces.IHWSubmissionDeviceSet">
260 <allow260 <allow
261 interface="canonical.launchpad.interfaces.IHWSubmissionDeviceSet" />261 interface="canonical.launchpad.interfaces.IHWSubmissionDeviceSet" />
262 </securedutility>262 </securedutility>
263263
264 <class class="canonical.launchpad.database.HWSubmissionBug">264 <class class="canonical.launchpad.database.hwdb.HWSubmissionBug">
265 <allow265 <allow
266 interface="canonical.launchpad.interfaces.IHWSubmissionBug" />266 interface="canonical.launchpad.interfaces.IHWSubmissionBug" />
267 <allow attributes="id" />267 <allow attributes="id" />
268 </class>268 </class>
269269
270 <securedutility270 <securedutility
271 class="canonical.launchpad.database.HWSubmissionBugSet"271 class="canonical.launchpad.database.hwdb.HWSubmissionBugSet"
272 provides="canonical.launchpad.interfaces.IHWSubmissionBugSet">272 provides="canonical.launchpad.interfaces.IHWSubmissionBugSet">
273 <allow273 <allow
274 interface="canonical.launchpad.interfaces.IHWSubmissionBugSet" />274 interface="canonical.launchpad.interfaces.IHWSubmissionBugSet" />
275275
=== modified file 'lib/canonical/launchpad/zcml/launchpadstatistic.zcml'
--- lib/canonical/launchpad/zcml/launchpadstatistic.zcml 2009-09-18 13:24:29 +0000
+++ lib/canonical/launchpad/zcml/launchpadstatistic.zcml 2009-09-29 02:05:39 +0000
@@ -9,14 +9,14 @@
9 i18n_domain="launchpad">9 i18n_domain="launchpad">
1010
11 <!-- LaunchpadStatistic -->11 <!-- LaunchpadStatistic -->
12 <class class="canonical.launchpad.database.LaunchpadStatistic">12 <class class="canonical.launchpad.database.launchpadstatistic.LaunchpadStatistic">
13 <allow interface="canonical.launchpad.interfaces.ILaunchpadStatistic" />13 <allow interface="canonical.launchpad.interfaces.launchpadstatistic.ILaunchpadStatistic" />
14 </class>14 </class>
1515
1616
17 <!-- LaunchpadStatisticSet -->17 <!-- LaunchpadStatisticSet -->
18 <securedutility18 <securedutility
19 class="canonical.launchpad.database.LaunchpadStatisticSet"19 class="canonical.launchpad.database.launchpadstatistic.LaunchpadStatisticSet"
20 provides="canonical.launchpad.interfaces.ILaunchpadStatisticSet">20 provides="canonical.launchpad.interfaces.ILaunchpadStatisticSet">
21 <allow interface="canonical.launchpad.interfaces.ILaunchpadStatisticSet" />21 <allow interface="canonical.launchpad.interfaces.ILaunchpadStatisticSet" />
22 </securedutility>22 </securedutility>