Merge lp:~lifeless/launchpad/bug-731736 into lp:launchpad

[Robert Collins]

Remove all db lookups in the /temporaryblobs collection - it should never have been iterable anyway.

Remove all db lookups in the /temporaryblobs collection - it should never have been iterable anyway.

[William Grant (wgrant)]

review: Approve (code*)

[Robert Collins (lifeless)]

oooh

review: Approve

=== modified file 'lib/canonical/launchpad/database/temporaryblobstorage.py'
--- lib/canonical/launchpad/database/temporaryblobstorage.py	2010-11-08 12:52:43 +0000
+++ lib/canonical/launchpad/database/temporaryblobstorage.py	2011-03-09 04:54:41 +0000
@@ -151,10 +151,4 @@
 
     def default_temporary_blob_storage_list(self):
         """See `ITemporaryStorageManager`."""
-        # Return the 50 most recent blobs.
-        store = IStore(TemporaryBlobStorage)
-        return store.find(
-            TemporaryBlobStorage,
-            TemporaryBlobStorage.file_alias == LibraryFileAlias.id,
-            LibraryFileAlias.expires > datetime.utcnow().replace(tzinfo=utc)
-            ).order_by(TemporaryBlobStorage.date_created)
+        return []

=== modified file 'lib/canonical/launchpad/interfaces/temporaryblobstorage.py'
--- lib/canonical/launchpad/interfaces/temporaryblobstorage.py	2010-08-20 20:31:18 +0000
+++ lib/canonical/launchpad/interfaces/temporaryblobstorage.py	2011-03-09 04:54:41 +0000
@@ -91,8 +91,4 @@
 
     @collection_default_content()
     def default_temporary_blob_storage_list():
-        """Return the default list of `ITemporaryBlobStorage` objects.
-
-        :returns: All the the `ITemporaryBlobStorage` blobs whose file
-                  aliases have not expired.
-        """
+        """Return an empty set - only exists to keep lazr.restful happy."""

=== modified file 'lib/canonical/launchpad/pagetests/webservice/xx-temporary-blob-storage.txt'
--- lib/canonical/launchpad/pagetests/webservice/xx-temporary-blob-storage.txt	2010-06-07 20:18:28 +0000
+++ lib/canonical/launchpad/pagetests/webservice/xx-temporary-blob-storage.txt	2011-03-09 04:54:41 +0000
@@ -2,15 +2,14 @@
 ==========================
 
 The set of temporary blobs in Launchpad is represented by the collection
-found at /temporary-blobs. The collection contains all the temporary
-blobs whose file aliases have not expired.
+found at /temporary-blobs. The collection is always empty because there
+is no use case for external iteration.
 
     >>> temporary_blobs = webservice.get('/temporary-blobs').jsonBody()
     >>> len(temporary_blobs['entries'])
     0
 
-If we add a new blob, it will show up in the temporary_blobs entries
-set.
+If we add a new blob, it will not show up in the temporary_blobs entries set.
 
     >>> login('[e-mail]')
     >>> import os
@@ -34,18 +33,10 @@
 
     >>> temporary_blobs = webservice.get('/temporary-blobs').jsonBody()
     >>> len(temporary_blobs['entries'])
-    1
-
-Each of the entries in the temporary_blobs entries set is an
-ITemporaryBlobStorage instance. A blob is identified by its UUID, which
-is exported via the webservice as 'token', in keeping with how it's
-referred to in the UI.
-
-    >>> blob = temporary_blobs['entries'][0]
-    >>> blob['token'] == blob_token
-    True
-
-It's possible to fetch a blob directly using its token.
+    0
+
+It is however possible to fetch a blob directly using its token (so that apport
+can tell when a bug is ready to file).
 
     >>> blob_link = '/temporary-blobs/' + blob_token
     >>> blob = webservice.get(blob_link).jsonBody()