← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~wgrant/launchpad/everything-into-lp.shipit into lp:launchpad

 

William Grant has proposed merging lp:~wgrant/launchpad/everything-into-lp.shipit into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  #724138 canonical.widgets exists
  https://bugs.launchpad.net/bugs/724138

For more details, see:
https://code.launchpad.net/~wgrant/launchpad/everything-into-lp.shipit/+merge/51080

All of canonical.shipit's lp.* imports now go through the lp.shipit compatibility layer, but it still directly imports things from canonical.*. This branch adds all remaining imports to lp.shipit.
-- 
https://code.launchpad.net/~wgrant/launchpad/everything-into-lp.shipit/+merge/51080
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/everything-into-lp.shipit into lp:launchpad.
=== modified file 'lib/lp/shipit.py'
--- lib/lp/shipit.py	2010-12-14 09:51:23 +0000
+++ lib/lp/shipit.py	2011-02-24 07:05:22 +0000
@@ -1,3 +1,18 @@
+from canonical.config import config
+from canonical.database.constants import UTC_NOW
+from canonical.database.datetimecol import UtcDateTimeCol
+from canonical.database.enumcol import EnumCol
+from canonical.database.sqlbase import (
+    block_implicit_flushes,
+    cursor,
+    ISOLATION_LEVEL_READ_COMMITTED,
+    flush_database_caches,
+    flush_database_updates,
+    quote,
+    quote_like,
+    SQLBase,
+    sqlvalues,
+    )
 from canonical.launchpad import _
 # From browser/configure.zcml.
 from canonical.launchpad.browser import MaintenanceMessage
@@ -31,6 +46,7 @@
 from canonical.launchpad.layers import setFirstLayer
 from canonical.launchpad.security import AuthorizationBase
 from canonical.launchpad.testing.browser import (
+    Browser,
     setUp,
     tearDown,
     )
@@ -46,8 +62,6 @@
     tearDown as sd_tearDown,
     )
 from canonical.launchpad.validators import LaunchpadValidationError
-from lp.app import versioninfo
-from lp.app.versioninfo import revno
 from canonical.launchpad.webapp import (
     canonical_url,
     Navigation,
@@ -89,12 +103,26 @@
     SRegResponse_fromSuccessResponse_stubbed,
     )
 from canonical.launchpad.webapp.vhosts import allvhosts
+from canonical.lazr import ExportedFolder
+from canonical.testing.layers import (
+    AppServerLayer,
+    DatabaseFunctionalLayer,
+    FunctionalLayer,
+    LaunchpadFunctionalLayer,
+    LaunchpadLayer,
+    )
+from lp.app import versioninfo
 from lp.app.browser.launchpadform import (
     action,
     custom_widget,
     LaunchpadEditFormView,
     LaunchpadFormView,
     )
+from lp.app.versioninfo import revno
+from lp.app.widgets.itemswidgets import (
+    CheckBoxMatrixWidget,
+    LabeledMultiCheckBoxWidget,
+    )
 from lp.registry.interfaces.person import (
     IPerson,
     IPersonSet,