launchpad-reviewers team mailing list archive

[William Grant <me@xxxxxxxxxxxxxxxxxx>]

William Grant has proposed merging lp:~wgrant/launchpad/remove-canonical.widgets 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/remove-canonical.widgets/+merge/51277

canonical.widgets should not be. This branch removes the ShipIt-placating imports that remained from the move to lp.app.widgets. I've just landed a ShipIt branch removing the problematic imports, so canonical.widgets can join its canonical.* kin in death.
-- 
https://code.launchpad.net/~wgrant/launchpad/remove-canonical.widgets/+merge/51277
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/remove-canonical.widgets into lp:launchpad.

=== removed directory 'lib/canonical/widgets'
=== removed file 'lib/canonical/widgets/__init__.py'
--- lib/canonical/widgets/__init__.py	2011-02-02 21:39:04 +0000
+++ lib/canonical/widgets/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-# This is a stub to keep canonical.shipit operational. this module
-# can delete when shipit is independent.
-
-from lp.app.widgets.itemswidgets import (
-    CheckBoxMatrixWidget,
-    LabeledMultiCheckBoxWidget,
-    )
-
-

=== modified file 'lib/lp/app/widgets/helpers.py'
--- lib/lp/app/widgets/helpers.py	2011-02-01 21:01:02 +0000
+++ lib/lp/app/widgets/helpers.py	2011-02-25 10:59:58 +0000
@@ -1,13 +1,13 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""Helpers for canonical widgets."""
+"""Helpers for Launchpad widgets."""
 
 import os
 
 
 def get_widget_template(filename):
-    """Return the content of lib/canonical/widgets/templates/<filename>."""
+    """Return the content of lib/lp/app/widgets/templates/<filename>."""
     here = os.path.dirname(__file__)
     template_path = os.path.join(here, 'templates', filename)
     file = open(template_path)

=== modified file 'lp-sfood-packages'
--- lp-sfood-packages	2011-02-17 12:54:12 +0000
+++ lp-sfood-packages	2011-02-25 10:59:58 +0000
@@ -17,17 +17,11 @@
 lp/archivepublisher
 lp/app
 lp/answers
-canonical/widgets
-canonical/tests
 canonical/testing
-canonical/poppy
-canonical/not-used
 canonical/lp
 canonical/librarian
 canonical/lazr
 canonical/launchpad
-canonical/ftests
-canonical/doap
 canonical/database/testing
 canonical/database
 canonical/config

=== modified file 'utilities/check-templates.sh'
--- utilities/check-templates.sh	2009-06-24 20:22:29 +0000
+++ utilities/check-templates.sh	2011-02-25 10:59:58 +0000
@@ -11,7 +11,6 @@
           lib/zope/app/exception/browser/configure.zcml
           lib/zope/app/debugskin/configure.zcml
           lib/canonical/launchpad/webapp/*.zcml
-          lib/canonical/widgets/*.py
           lib/canonical/launchpad/browser/*.py"
 
 MASTER_MACRO='metal:use-macro="context/@@main_template/master"'

=== modified file 'utilities/sourcedeps.conf'
--- utilities/sourcedeps.conf	2011-02-21 12:04:11 +0000
+++ utilities/sourcedeps.conf	2011-02-25 10:59:58 +0000
@@ -15,4 +15,4 @@
 subvertpy lp:~launchpad-pqm/subvertpy/trunk;revno=2042
 python-debian lp:~launchpad-pqm/python-debian/devel;revno=185
 testresources lp:~launchpad-pqm/testresources/dev;revno=16
-shipit lp:~launchpad-pqm/shipit/trunk;revno=8922 optional
+shipit lp:~launchpad-pqm/shipit/trunk;revno=8923 optional