Merge lp:~james-w/launchpad/remove-code-import-list into lp:launchpad

[James Westby]

+code-import-list has been removed in favour of +code-imports

This removes +code-import-list which is obsoleted by
+code-imports.

Thanks,

James

[Aaron Bentley (abentley)]

Was there a preimplementation call? Is there an associated bug? Is there any lint?

This seems to change the way import_count is calculated. Why is that?

[James Westby (james-w)]

Here's the reason why I made this change:

[20:52] <james_w> thumper: could you perhaps provide a little SQL help?
[20:53] <thumper> sure
[20:54] <james_w> CodeImportSet.composeQueryString() assumes a Product, but that will no longer always be true in my branch
[20:54] <james_w> I need to rewrite the query to allow for using SourcePackage as well
[20:55] <thumper> ok
=== salgado-brb is now known as salgado
[20:55] <thumper> james_w: I'm just looking at your code import target branch
[20:55] <thumper> hmm.. seems to have gone
[20:55] <james_w> great
[20:56] <james_w> I keep screwing up the initial settings and forgetting things like prerequisite branches
[20:56] <thumper> :)
[20:56] <thumper> james_w: can you paste me a link?
[20:56] <james_w> https://code.edge.launchpad.net/~james-w/launchpad/code-imports-use-ibranchtarget
[20:56] <james_w> https://code.edge.launchpad.net/~james-w/launchpad/code-imports-use-ibranchtarget/+merge/21651
[20:57] <james_w> the intention of that one is just to refactor, not allow any new behaviour
[20:58] <james_w> and to make the tests more explicit about if they require the code import to be against a product
[21:06] <thumper> james_w: reviewed
[21:06] <james_w> thanks
[21:06] <mwhudson> flacoste: so buildbot farted again
[21:06] <mwhudson> flacoste: did you read my mail yet? (i only sent it a minute or so ago)
[21:07] <thumper> james_w: composeQueryString needs to die
[21:07] <james_w> even better
[21:07] <flacoste> mwhudson: switching to email...
[21:08] <mwhudson> thumper, james_w: it's used for the search box on https://code.edge.launchpad.net/+code-import-list
[21:08] <mwhudson> but maybe that page needs to die now
[21:08] <mwhudson> (now that (a) we disable failing imports (b) +code-imports is more useful)
[21:08] * thumper looks at the page
[21:09] <thumper> my vote is kill the page
[21:10] <thumper> +code-imports is where we should add stuff now
[21:10] <james_w> right, a search box isn't too useful as you could go from search->project->branch->info
[21:10] * james_w starts a new branch
...
[21:40] <james_w> thumper: what count should be on https://code.edge.launchpad.net/ for imported branches?
[21:40] <james_w> (see the bottom if you have forgotten it was there :-)
[21:48] <thumper> james_w: my suggestion would be working code imports
[21:49] <james_w> thumper: just a count of all imports in the REVIEWED state?
[21:49] <thumper> james_w: yeah
[21:49] <thumper> what is it now?
[21:49] <james_w> all "active"
[21:50] <james_w> so REVIEWED and not for deactivated products/projects
[21:50] <james_w> and tried at least once
[21:50] <james_w> so REVIEWED is a fine approximation in my opinion
[21:51] <mwhudson> REVIEWED is a decent approximation now we mark imports failing automatically

There was no call, as this discussion seemed sufficient.

There isn't an associated bug.

I don't know about lint.

> This seems to change the way import_count is calculated. Why is that?

It makes the change as that is basically the point of the branch.

Thanks,

James

[James Westby (james-w)]

New revision pushed with problems from lint fixed.

Thanks,

James

[Aaron Bentley (abentley)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

James Westby wrote:
> Here's the reason why I made this change:

Great. Unless I'm a domain expert, I need to know that any change has
been sanity-checked by a domain expert, so please note things like this
when requesting reviews in the future.

> I don't know about lint.

There is quite a lot of it. You can see it by running "make lint", and
you should do that before submitting a branch for review. In general,
you should fix any lint that you encounter.

I recommend installing the lp:lpreview-body plugin, and then either
using "bzr lp-propose" or "bzr send" to create your merge proposals, as
this will automatically run lint on the relevant files and provide a
template for your review request.

>> This seems to change the way import_count is calculated. Why is that?
>
> It makes the change as that is basically the point of the branch.

The described point of the branch was "This removes +code-import-list
which is obsoleted by +code-imports," which had no obvious connection.
Now that I see the IRC log, it's much clearer.

Please fix the lint, but otherwise this is

 merge approved

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkun0WgACgkQ0F+nu1YWqI33tQCcDVKcXTybC/viU3Ss9yYEk9FC
ZlAAn3rcUyW6QssMIuERgcL8RNQxhYXZ
=nuwN
-----END PGP SIGNATURE-----

review: Approve

=== modified file 'lib/lp/code/browser/bazaar.py'
--- lib/lp/code/browser/bazaar.py	2009-08-28 01:31:51 +0000
+++ lib/lp/code/browser/bazaar.py	2010-04-02 02:45:43 +0000
@@ -21,6 +21,7 @@
 from canonical.launchpad.webapp.authorization import (
     precache_permission_for_objects)
 
+from lp.code.enums import CodeImportReviewStatus
 from lp.code.interfaces.branch import IBranchCloud, IBranchSet
 from lp.code.interfaces.branchcollection import IAllBranches
 from lp.code.interfaces.codeimport import ICodeImportSet
@@ -61,7 +62,8 @@
 
     @property
     def import_count(self):
-        return getUtility(ICodeImportSet).getActiveImports().count()
+        return getUtility(ICodeImportSet).search(
+            review_status=CodeImportReviewStatus.REVIEWED).count()
 
     @property
     def bzr_version(self):

=== modified file 'lib/lp/code/browser/configure.zcml'
--- lib/lp/code/browser/configure.zcml	2010-03-18 17:30:14 +0000
+++ lib/lp/code/browser/configure.zcml	2010-04-02 02:45:43 +0000
@@ -57,13 +57,6 @@
       permission="zope.Public"
       />
   <browser:page
-      for="canonical.launchpad.webapp.interfaces.ILaunchpadApplication"
-      name="+code-import-list"
-      class="lp.registry.browser.productseries.ProductSeriesSourceListView"
-      template="../templates/sources-list.pt"
-      permission="zope.Public"
-      />
-  <browser:page
       for="zope.interface.Interface"
       name="+test-webservice-js"
       template="../../../canonical/launchpad/templates/test-webservice-js.pt"

=== modified file 'lib/lp/code/interfaces/codeimport.py'
--- lib/lp/code/interfaces/codeimport.py	2010-03-26 01:05:26 +0000
+++ lib/lp/code/interfaces/codeimport.py	2010-04-02 02:45:43 +0000
@@ -188,16 +188,6 @@
         :param target: An `IBranchTarget` that the code is associated with.
         """
 
-    def getActiveImports(text=None):
-        """Return an iterable of all 'active' CodeImport objects.
-
-        Active is defined, somewhat arbitrarily, as having
-        review_status==REVIEWED and having completed at least once.
-
-        :param text: If specifed, limit to the results to those that contain
-            ``text`` in the product or project titles and descriptions.
-        """
-
     def get(id):
         """Get a CodeImport by its id.
 

=== modified file 'lib/lp/code/model/codeimport.py'
--- lib/lp/code/model/codeimport.py	2010-03-18 15:39:58 +0000
+++ lib/lp/code/model/codeimport.py	2010-04-02 02:45:43 +0000
@@ -30,10 +30,9 @@
 from canonical.database.constants import DEFAULT
 from canonical.database.datetimecol import UtcDateTimeCol
 from canonical.database.enumcol import EnumCol
-from canonical.database.sqlbase import SQLBase, quote, sqlvalues
+from canonical.database.sqlbase import SQLBase
 from canonical.launchpad.interfaces import IStore
 from lp.code.model.codeimportjob import CodeImportJobWorkflow
-from lp.registry.model.productseries import ProductSeries
 from canonical.launchpad.webapp.interfaces import NotFoundError
 from lp.code.enums import (
     BranchType, CodeImportJobState, CodeImportResultStatus,
@@ -41,8 +40,6 @@
 from lp.code.interfaces.codeimport import ICodeImport, ICodeImportSet
 from lp.code.interfaces.codeimportevent import ICodeImportEventSet
 from lp.code.interfaces.codeimportjob import ICodeImportJobWorkflow
-from lp.code.interfaces.branchnamespace import (
-    get_branch_namespace)
 from lp.code.model.codeimportresult import CodeImportResult
 from lp.code.mail.codeimport import code_import_updated
 from lp.registry.interfaces.person import validate_public_person
@@ -256,51 +253,6 @@
             CodeImportJob.delete(code_import.import_job.id)
         CodeImport.delete(code_import.id)
 
-    def getActiveImports(self, text=None):
-        """See `ICodeImportSet`."""
-        query = self.composeQueryString(text)
-        return CodeImport.select(
-            query, orderBy=['product.name', 'branch.name'],
-            clauseTables=['Product', 'Branch'])
-
-    def composeQueryString(self, text=None):
-        """Build SQL "where" clause for `CodeImport` search.
-
-        :param text: Text to search for in the product and project titles and
-            descriptions.
-        """
-        conditions = [
-            "date_last_successful IS NOT NULL",
-            "review_status=%s" % sqlvalues(CodeImportReviewStatus.REVIEWED),
-            "CodeImport.branch = Branch.id",
-            "Branch.product = Product.id",
-            ]
-        if text == u'':
-            text = None
-
-        # First filter on text, if supplied.
-        if text is not None:
-            conditions.append("""
-                ((Project.fti @@ ftq(%s) AND Product.project IS NOT NULL) OR
-                Product.fti @@ ftq(%s))""" % (quote(text), quote(text)))
-
-        # Exclude deactivated products.
-        conditions.append('Product.active IS TRUE')
-
-        # Exclude deactivated projects, too.
-        conditions.append(
-            "((Product.project = Project.id AND Project.active) OR"
-            " Product.project IS NULL)")
-
-        # And build the query.
-        query = " AND ".join(conditions)
-        return """
-            codeimport.id IN
-            (SELECT codeimport.id FROM codeimport, branch, product, project
-             WHERE %s)
-            AND codeimport.branch = branch.id
-            AND branch.product = product.id""" % query
-
     def get(self, id):
         """See `ICodeImportSet`."""
         try:

=== modified file 'lib/lp/code/model/tests/test_codeimport.py'
--- lib/lp/code/model/tests/test_codeimport.py	2010-03-18 17:49:21 +0000
+++ lib/lp/code/model/tests/test_codeimport.py	2010-04-02 02:45:43 +0000
@@ -11,14 +11,11 @@
 from storm.store import Store
 from zope.component import getUtility
 
-from lp.codehosting.codeimport.tests.test_workermonitor import (
-    nuke_codeimport_sample_data)
 from lp.code.model.codeimport import CodeImportSet
 from lp.code.model.codeimportevent import CodeImportEvent
 from lp.code.model.codeimportjob import CodeImportJob, CodeImportJobSet
 from lp.code.model.codeimportresult import CodeImportResult
 from lp.code.interfaces.branchtarget import IBranchTarget
-from lp.code.interfaces.codeimport import ICodeImportSet
 from lp.registry.interfaces.person import IPersonSet
 from lp.code.enums import (
     CodeImportResultStatus, CodeImportReviewStatus, RevisionControlSystems)
@@ -551,196 +548,5 @@
             requester, code_import.import_job.requesting_user)
 
 
-def make_active_import(factory, project_name=None, product_name=None,
-                       branch_name=None, svn_branch_url=None,
-                       cvs_root=None, cvs_module=None, git_repo_url=None,
-                       hg_repo_url=None, last_update=None, rcs_type=None):
-    """Make a new CodeImport for a new Product, maybe in a new Project.
-
-    The import will be 'active' in the sense used by
-    `ICodeImportSet.getActiveImports`.
-    """
-    if project_name is not None:
-        project = factory.makeProject(name=project_name)
-    else:
-        project = None
-    product = factory.makeProduct(
-        name=product_name, displayname=product_name, project=project)
-    code_import = factory.makeProductCodeImport(
-        product=product, branch_name=branch_name,
-        svn_branch_url=svn_branch_url, cvs_root=cvs_root,
-        cvs_module=cvs_module, git_repo_url=git_repo_url,
-        hg_repo_url=hg_repo_url, rcs_type=None)
-    make_import_active(factory, code_import, last_update)
-    return code_import
-
-
-def make_import_active(factory, code_import, last_update=None):
-    """Make `code_import` active as per `ICodeImportSet.getActiveImports`."""
-    from zope.security.proxy import removeSecurityProxy
-    naked_import = removeSecurityProxy(code_import)
-    if naked_import.review_status != CodeImportReviewStatus.REVIEWED:
-        naked_import.updateFromData(
-            {'review_status': CodeImportReviewStatus.REVIEWED},
-            factory.makePerson())
-    if last_update is None:
-        # If last_update is not specfied, presumably we don't care what it is
-        # so we just use some made up value.
-        last_update = datetime(2008, 1, 1, tzinfo=pytz.UTC)
-    naked_import.date_last_successful = last_update
-
-
-def deactivate(project_or_product):
-    """Mark `project_or_product` as not active."""
-    from zope.security.proxy import removeSecurityProxy
-    removeSecurityProxy(project_or_product).active = False
-
-
-class TestGetActiveImports(TestCaseWithFactory):
-    """Tests for CodeImportSet.getActiveImports()."""
-
-    layer = DatabaseFunctionalLayer
-
-    def setUp(self):
-        """Prepare by deleting all the import data in the sample data.
-
-        This means that the tests only have to care about the import
-        data they create.
-        """
-        super(TestGetActiveImports, self).setUp()
-        nuke_codeimport_sample_data()
-        login('[e-mail]')
-
-    def tearDown(self):
-        super(TestGetActiveImports, self).tearDown()
-        logout()
-
-    def testEmpty(self):
-        # We start out with no code imports, so getActiveImports() returns no
-        # results.
-        results = getUtility(ICodeImportSet).getActiveImports()
-        self.assertEquals(list(results), [])
-
-    def testOneSeries(self):
-        # When there is one active import, it is returned.
-        code_import = make_active_import(self.factory)
-        results = getUtility(ICodeImportSet).getActiveImports()
-        self.assertEquals(list(results), [code_import])
-
-    def testOneSeriesWithProject(self):
-        # Code imports for products with a project should be returned too.
-        code_import = make_active_import(
-            self.factory, project_name="whatever")
-        results = getUtility(ICodeImportSet).getActiveImports()
-        self.assertEquals(list(results), [code_import])
-
-    def testExcludeDeactivatedProducts(self):
-        # Deactivating a product means that code imports associated to it are
-        # no longer returned.
-        code_import = make_active_import(self.factory)
-        self.failUnless(code_import.branch.product.active)
-        results = getUtility(ICodeImportSet).getActiveImports()
-        self.assertEquals(list(results), [code_import])
-        deactivate(code_import.branch.product)
-        results = getUtility(ICodeImportSet).getActiveImports()
-        self.assertEquals(list(results), [])
-
-    def testExcludeDeactivatedProjects(self):
-        # Deactivating a project means that code imports associated to
-        # products in it are no longer returned.
-        code_import = make_active_import(
-            self.factory, project_name="whatever")
-        self.failUnless(code_import.branch.product.project.active)
-        results = getUtility(ICodeImportSet).getActiveImports()
-        self.assertEquals(list(results), [code_import])
-        deactivate(code_import.branch.product.project)
-        results = getUtility(ICodeImportSet).getActiveImports()
-        self.assertEquals(list(results), [])
-
-    def testSorting(self):
-        # Returned code imports are sorted by product name, then branch name.
-        prod1_a = make_active_import(
-            self.factory, product_name='prod1', branch_name='a')
-        prod2_a = make_active_import(
-            self.factory, product_name='prod2', branch_name='a')
-        prod1_b = self.factory.makeProductCodeImport(
-            product=prod1_a.branch.product, branch_name='b')
-        make_import_active(self.factory, prod1_b)
-        results = getUtility(ICodeImportSet).getActiveImports()
-        self.assertEquals(
-            list(results), [prod1_a, prod1_b, prod2_a])
-
-    def testSearchByProduct(self):
-        # Searching can filter by product name and other texts.
-        code_import = make_active_import(
-            self.factory, product_name='product')
-        results = getUtility(ICodeImportSet).getActiveImports(
-            text='product')
-        self.assertEquals(
-            list(results), [code_import])
-
-    def testSearchByProductWithProject(self):
-        # Searching can filter by product name and other texts, and returns
-        # matching imports even if the associated product is in a project
-        # which does not match.
-        code_import = make_active_import(
-            self.factory, project_name='whatever', product_name='product')
-        results = getUtility(ICodeImportSet).getActiveImports(
-            text='product')
-        self.assertEquals(
-            list(results), [code_import])
-
-    def testSearchByProject(self):
-        # Searching can filter by project name and other texts.
-        code_import = make_active_import(
-            self.factory, project_name='project', product_name='product')
-        results = getUtility(ICodeImportSet).getActiveImports(
-            text='project')
-        self.assertEquals(
-            list(results), [code_import])
-
-    def testSearchByProjectWithNonMatchingProduct(self):
-        # If a project matches the text, it's an easy mistake to make to
-        # consider all the products with no project as matching too.
-        code_import_1 = make_active_import(
-            self.factory, product_name='product1')
-        code_import_2 = make_active_import(
-            self.factory, project_name='thisone', product_name='product2')
-        results = getUtility(ICodeImportSet).getActiveImports(
-            text='thisone')
-        self.assertEquals(
-            list(results), [code_import_2])
-
-    def testJoining(self):
-        # Test that the query composed by CodeImportSet.composeQueryString
-        # gets the joins right.  We create code imports for each of the
-        # possibilities of active or inactive product and active or inactive
-        # or absent project.
-        expected = set()
-        source = {}
-        for project_active in [True, False, None]:
-            for product_active in [True, False]:
-                if project_active is not None:
-                    project_name = self.factory.getUniqueString()
-                else:
-                    project_name = None
-                code_import = make_active_import(
-                    self.factory, project_name=project_name)
-                if code_import.branch.product.project and not project_active:
-                    deactivate(code_import.branch.product.project)
-                if not product_active:
-                    deactivate(code_import.branch.product)
-                if project_active != False and product_active:
-                    expected.add(code_import)
-                source[code_import] = (product_active, project_active)
-        results = set(getUtility(ICodeImportSet).getActiveImports())
-        errors = []
-        for extra in results - expected:
-            errors.append(('extra', source[extra]))
-        for missing in expected - results:
-            errors.append(('extra', source[missing]))
-        self.assertEquals(errors, [])
-
-
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/code/stories/branches/xx-bazaar-home.txt'
--- lib/lp/code/stories/branches/xx-bazaar-home.txt	2009-08-28 05:57:37 +0000
+++ lib/lp/code/stories/branches/xx-bazaar-home.txt	2010-04-02 02:45:43 +0000
@@ -16,7 +16,7 @@
     >>> print extract_text(footer)
     30 branches registered in
     6 projects
-    0 imported branches
+    1 imported branches
     2 branches associated with bug reports
     Launchpad uses Bazaar 0.92.0.
 

=== removed file 'lib/lp/code/stories/codeimport/xx-codeimport-list.txt'
--- lib/lp/code/stories/codeimport/xx-codeimport-list.txt	2010-01-12 22:09:23 +0000
+++ lib/lp/code/stories/codeimport/xx-codeimport-list.txt	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-There is a page listing all the active code imports on the code
-homepage.
-
-We start by deleting all the code import sample data and creating a
-few imports that will be displayed in the listing.
-
-    >>> import datetime
-    >>> import pytz
-    >>> from lp.codehosting.codeimport.tests.test_workermonitor import (
-    ...     nuke_codeimport_sample_data)
-    >>> from lp.code.enums import RevisionControlSystems
-    >>> from lp.code.model.tests.test_codeimport import (
-    ...     make_active_import)
-    >>> from lp.code.interfaces.codeimport import ICodeImportSet
-    >>> from lp.testing import login, logout
-    >>> from zope.component import getUtility
-    >>> login('[e-mail]')
-    >>> nuke_codeimport_sample_data()
-    >>> code_import_set = getUtility(ICodeImportSet)
-    >>> active_svn_import = make_active_import(
-    ...     factory, product_name="myproject", branch_name="trunk",
-    ...     svn_branch_url="http://example.com/svn/myproject/trunk",
-    ...     last_update=datetime.datetime(2007, 1, 1, tzinfo=pytz.UTC))
-    >>> active_bzr_svn_import = make_active_import(
-    ...     factory, product_name="ourproject", branch_name="trunk",
-    ...     svn_branch_url="http://example.com/bzr-svn/myproject/trunk",
-    ...     rcs_type=RevisionControlSystems.BZR_SVN,
-    ...     last_update=datetime.datetime(2007, 1, 2, tzinfo=pytz.UTC))
-    >>> active_cvs_import = make_active_import(
-    ...     factory, product_name="hisproj", branch_name="main",
-    ...     cvs_root=":pserver:[e-mail]:/cvs", cvs_module="hisproj",
-    ...     last_update=datetime.datetime(2007, 1, 3, tzinfo=pytz.UTC))
-    >>> active_git_import = make_active_import(
-    ...     factory, product_name="herproj", branch_name="master",
-    ...     git_repo_url="git://git.example.org/herproj",
-    ...     last_update=datetime.datetime(2007, 1, 4, tzinfo=pytz.UTC))
-    >>> active_hg_import = make_active_import(
-    ...     factory, product_name="hg-proj", branch_name="tip",
-    ...     hg_repo_url="http://hg.example.org/proj",
-    ...     last_update=datetime.datetime(2007, 1, 5, tzinfo=pytz.UTC))
-    >>> len(list(code_import_set.getActiveImports()))
-    5
-    >>> logout()
-
-The page is linked to from the "$N imported branches" text.
-
-    >>> browser.open('http://code.launchpad.dev')
-    >>> browser.getLink('5 imported branches').click()
-    >>> print browser.title
-    Available code imports
-
-It lists the active imports, sorted by product then branch name:
-
-   >>> def print_import_table():
-   ...     table = first_tag_by_class(browser.contents, 'listing')
-   ...     print extract_text(table)
-
-   >>> print_import_table()
-   Project    Branch Name Source Details                             Last Updated
-   herproj    master      git://git.example.org/herproj              2007-01-04
-   hg-proj    tip         http://hg.example.org/proj                 2007-01-05
-   hisproj    main        :pserver:[e-mail]:/cvs hisproj     2007-01-03
-   myproject  trunk       http://example.com/svn/myproject/trunk     2007-01-01
-   ourproject trunk       http://example.com/bzr-svn/myproject/trunk 2007-01-02
-
-You can filter the list by product:
-
-   >>> browser.getControl(name='text').value = 'hisproj'
-   >>> browser.getControl('Search', index=0).click()
-   >>> print_import_table()
-   Project   Branch Name Source Details                         Last Updated
-   hisproj   main        :pserver:[e-mail]:/cvs hisproj 2007-01-03

=== modified file 'lib/lp/code/stories/codeimport/xx-codeimport-view.txt'
--- lib/lp/code/stories/codeimport/xx-codeimport-view.txt	2010-03-18 17:49:21 +0000
+++ lib/lp/code/stories/codeimport/xx-codeimport-view.txt	2010-04-02 02:45:43 +0000
@@ -1,10 +1,10 @@
 Code imports
 ============
 
-For now, there is no link to the page that lists all code imports, so
-we browse there directly:
+The code imports overview page is linked of the main code page.
 
-    >>> browser.open('http://code.launchpad.dev/+code-imports')
+    >>> browser.open('http://code.launchpad.dev')
+    >>> browser.getLink('1 imported branches').click()
     >>> print browser.title
     Code Imports
 

=== modified file 'lib/lp/code/templates/bazaar-index.pt'
--- lib/lp/code/templates/bazaar-index.pt	2010-03-11 06:43:00 +0000
+++ lib/lp/code/templates/bazaar-index.pt	2010-04-02 02:45:43 +0000
@@ -121,7 +121,7 @@
           </a>
         </div>
         <div>
-          <a href="/+code-import-list">
+          <a href="/+code-imports">
             <strong tal:content="view/import_count">123</strong>
             imported branches
           </a>

=== modified file 'lib/lp/registry/browser/productseries.py'
--- lib/lp/registry/browser/productseries.py	2010-03-23 00:39:45 +0000
+++ lib/lp/registry/browser/productseries.py	2010-04-02 02:45:43 +0000
@@ -20,7 +20,6 @@
     'ProductSeriesOverviewNavigationMenu',
     'ProductSeriesRdfView',
     'ProductSeriesReviewView',
-    'ProductSeriesSourceListView',
     'ProductSeriesSpecificationsMenu',
     'ProductSeriesUbuntuPackagingView',
     'ProductSeriesView',
@@ -50,8 +49,6 @@
 from lp.bugs.browser.bugtask import BugTargetTraversalMixin
 from canonical.launchpad.helpers import browserLanguages
 from lp.code.interfaces.branchjob import IRosettaUploadJobSource
-from lp.code.interfaces.codeimport import (
-    ICodeImportSet)
 from lp.services.worlddata.interfaces.country import ICountry
 from lp.bugs.interfaces.bugtask import IBugTaskSet
 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
@@ -70,7 +67,6 @@
     Link, Navigation, NavigationMenu, StandardLaunchpadFacets, stepthrough,
     stepto)
 from canonical.launchpad.webapp.authorization import check_permission
-from canonical.launchpad.webapp.batching import BatchNavigator
 from canonical.launchpad.webapp.breadcrumb import Breadcrumb
 from canonical.launchpad.webapp.interfaces import NotFoundError
 from canonical.launchpad.webapp.launchpadform import (
@@ -753,23 +749,6 @@
         return encodeddata
 
 
-class ProductSeriesSourceListView(LaunchpadView):
-    """A listing of all the running imports.
-
-    See `ICodeImportSet.getActiveImports` for our definition of running.
-    """
-
-    page_title = 'Available code imports'
-    label = page_title
-
-    def initialize(self):
-        """See `LaunchpadFormView`."""
-        self.text = self.request.get('text')
-        results = getUtility(ICodeImportSet).getActiveImports(text=self.text)
-
-        self.batchnav = BatchNavigator(results, self.request)
-
-
 class ProductSeriesFileBugRedirect(LaunchpadView):
     """Redirect to the product's +filebug page."""