launchpad-reviewers team mailing list archive

[Steve Kowalik <stevenk@xxxxxxxxxx>]

Steve Kowalik has proposed merging lp:~stevenk/launchpad/death-to-lazr-testing-tales into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~stevenk/launchpad/death-to-lazr-testing-tales/+merge/83889

Continue to chip away at lib/canonical, one file at a time.
-- 
https://code.launchpad.net/~stevenk/launchpad/death-to-lazr-testing-tales/+merge/83889
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~stevenk/launchpad/death-to-lazr-testing-tales into lp:launchpad.

=== removed file 'lib/canonical/lazr/testing/tales.py'
--- lib/canonical/lazr/testing/tales.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/lazr/testing/tales.py	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-# Re-import code from lazr.restful until it can be refactored into a
-# utility module.
-__all__ = []
-import lazr.restful.testing.tales
-__all__.extend(lazr.restful.testing.tales.__all__)
-from lazr.restful.testing.tales import *

=== modified file 'lib/lp/testing/__init__.py'
--- lib/lp/testing/__init__.py	2011-11-25 14:54:41 +0000
+++ lib/lp/testing/__init__.py	2011-11-30 01:55:28 +0000
@@ -93,6 +93,7 @@
 import simplejson
 from storm.store import Store
 import subunit
+from lazr.restful.testing.tales import test_tales
 import testtools
 from testtools.content import Content
 from testtools.content_type import UTF8_TEXT
@@ -151,7 +152,6 @@
     with_celebrity_logged_in,
     with_person_logged_in,
     )
-from lp.testing._tales import test_tales
 from lp.testing._webservice import (
     api_url,
     launchpadlib_credentials_for,

=== removed file 'lib/lp/testing/_tales.py'
--- lib/lp/testing/_tales.py	2010-08-20 20:31:18 +0000
+++ lib/lp/testing/_tales.py	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Compatibility shim."""
-
-# pylint: disable-msg=W0611
-from canonical.lazr.testing.tales import test_tales
-
-