Merge lp:~al-maisan/launchpad/url-props-505382 into lp:launchpad

[Muharem Hrnjadovic]

[Muharem Hrnjadovic (al-maisan)]

Hello there!

This branch is converting the SPPH.(source|binary)_file_urls properties in to
converted into methods since the operations behind these access the database
and are too heavyweight for properties.

Tests to run:

    bin/test -vv -t xx-source-package-publishing

No (pertinent) "make lint" issues.

[Michael Nelson (michael.nelson)]

Thanks Muharem! As we discussed verbally, the only confusion here is related to the sample data.

review: Approve (code)

=== modified file 'lib/lp/soyuz/interfaces/publishing.py'
--- lib/lp/soyuz/interfaces/publishing.py	2010-01-05 18:01:41 +0000
+++ lib/lp/soyuz/interfaces/publishing.py	2010-01-12 05:41:14 +0000
@@ -29,7 +29,7 @@
     'name_priority_map',
     ]
 
-from zope.schema import Bool, Choice, Datetime, Int, List, TextLine, Text
+from zope.schema import Bool, Choice, Datetime, Int, TextLine, Text
 from zope.interface import Interface, Attribute
 from lazr.enum import DBEnumeratedType, DBItem
 
@@ -534,20 +534,6 @@
             title=_("Source Package Version"),
             required=False, readonly=True))
 
-    source_file_urls = exported(
-        List(
-            value_type=Text(),
-            title=_("Source File URLs"),
-            description=_("URL list for this source publication's "
-                          "files from the source upload.")))
-
-    binary_file_urls = exported(
-        List(
-            value_type=Text(),
-            title=_("Binary File URLs"),
-            description=_("URL list for this source publication's "
-                          "files resulting from the build.")))
-
     package_creator = exported(
         Reference(
             IPerson,
@@ -690,6 +676,21 @@
                 }
         """
 
+    @export_read_operation()
+    def sourceFileUrls():
+        """URLs for this source publication's uploaded source files.
+
+        :return: A collection of URLs for this source.
+        """
+
+    @export_read_operation()
+    def binaryFileUrls():
+        """URLs for this source publication's binary files.
+
+        :return: A collection of URLs for this source.
+        """
+
+
 #
 # Binary package publishing
 #

=== modified file 'lib/lp/soyuz/model/publishing.py'
--- lib/lp/soyuz/model/publishing.py	2010-01-05 12:01:01 +0000
+++ lib/lp/soyuz/model/publishing.py	2010-01-12 05:41:14 +0000
@@ -865,24 +865,20 @@
         return [
             ProxiedLibraryFileAlias(file, parent).http_url for file in files]
 
-    @property
-    def source_file_urls(self):
+    def sourceFileUrls(self):
         """See `ISourcePackagePublishingHistory`."""
         source_urls = self._proxied_urls(
             [file.libraryfile for file in self.sourcepackagerelease.files],
              self.archive)
-
         return source_urls
 
-    @property
-    def binary_file_urls(self):
+    def binaryFileUrls(self):
         """See `ISourcePackagePublishingHistory`."""
         publishing_set = getUtility(IPublishingSet)
         binaries = publishing_set.getBinaryFilesForSources(
             self).config(distinct=True)
         binary_urls = self._proxied_urls(
             [binary for _source, binary, _content in binaries], self.archive)
-
         return binary_urls
 
 

=== modified file 'lib/lp/soyuz/stories/webservice/xx-source-package-publishing.txt'
--- lib/lp/soyuz/stories/webservice/xx-source-package-publishing.txt	2010-01-05 18:01:41 +0000
+++ lib/lp/soyuz/stories/webservice/xx-source-package-publishing.txt	2010-01-12 05:41:14 +0000
@@ -111,7 +111,6 @@
     >>> from lazr.restful.testing.webservice import pprint_entry
     >>> pprint_entry(pubs['entries'][0])
     archive_link: u'http://.../~cprov/+archive/ppa'
-    binary_file_urls: []
     component_name: u'main'
     date_created: ...
     date_made_pending: None
@@ -130,7 +129,6 @@
     scheduled_deletion_date: None
     section_name: u'base'
     self_link: u'http://.../~cprov/+archive/ppa/+sourcepub/...'
-    source_file_urls: [u'http://launchpad.dev/~cprov/+archive/ppa/+files/testwebservice_666.dsc']
     source_package_name: u'testwebservice'
     source_package_version: u'666'
     status: u'Pending'
@@ -342,23 +340,23 @@
 
     >>> pubs = webservice.named_get(
     ...     cprov_archive['self_link'], 'getPublishedSources').jsonBody()
-    >>> def print_source_urls(pubs):
-    ...     for source_file_urls in sorted(
-    ...         entry['source_file_urls'] for entry in pubs['entries']):
-    ...         print source_file_urls
-    >>> print_source_urls(pubs)
-    []
+    >>> for pub_link in sorted(
+    ...     entry['self_link'] for entry in pubs['entries']):
+    ...     source_urls = webservice.named_get(
+    ...         pub_link, 'sourceFileUrls').jsonBody()
+    ...     print source_urls
+    [u'http://launchpad.dev/~cprov/+archive/ppa/+files/foobar-1.0.dsc']
     [u'http://launchpad.dev/~cprov/+archive/ppa/+files/firefox_0.9.2.orig.tar.gz', u'http://launchpad.dev/~cprov/+archive/ppa/+files/iceweasel-1.0.dsc']
-    [u'http://launchpad.dev/~cprov/+archive/ppa/+files/foobar-1.0.dsc']
+    []
     [u'http://launchpad.dev/~cprov/+archive/ppa/+files/testwebservice_666.dsc']
 
-    >>> def print_binary_urls(pubs):
-    ...     for binary_file_urls in sorted(
-    ...         entry['binary_file_urls'] for entry in pubs['entries']):
-    ...         print binary_file_urls
-    >>> print_binary_urls(pubs)
-    []
-    []
+    >>> for pub_link in sorted(
+    ...     entry['self_link'] for entry in pubs['entries']):
+    ...     binary_urls = webservice.named_get(
+    ...         pub_link, 'binaryFileUrls').jsonBody()
+    ...     print binary_urls
     []
     [u'http://launchpad.dev/~cprov/+archive/ppa/+files/mozilla-firefox_0.9_i386.deb']
+    []
+    []