Merge lp:~gary/launchpad/lazr-dist into lp:launchpad

[Gary Poster]

[Gary Poster (gary)]

This branch converts us to using the newest versions of our own packages, via Python disributions:

launchpadlib
lazr.batchnavigator
lazr.config
lazr.delegates
lazr.enum
lazr.lifecycle
lazr.restful
lazr.restfulclient
wadllib

Many of the lines in the diff are because the underlying machinery of the lazr.restful testing helpers changed. It moved from relying on a zope functional testing framework to wsgi_intercept. This meant that I had to add some new testing helpers in the launchpad layer machinery (see lib/canonical/testing/layers.py); and the API of the webservice test helper (and its results) changed, so tests changed.

As an interesting side result, it's quite possible that we will be able to use launchpadlib within our functional tests now, or with a two line change to hook up wsgi_intercept in a different way.

An aspect of this worth particular note is that the webservice needs to have its domain set explicitly if you change domains. You can see this in the xx-service.txt diff, for instance.

I increased the timeout in lib/canonical/launchpad/testing/googletestservice.py because it helped me on my machine. I'm willing to change it back, but it seems pretty harmless to me.

In lib/canonical/launchpad/testing/pages.py, I remove "port" from calling the LaunchpadWebServiceCaller. It was ignored before, and I didn't see any reason to add it back. Perhaps the comment that explains its absence is unnecessary, though.

The MockRootFolder is added back to lib/canonical/lazr/testing/layers.py because it is no longer found in lazr.restful.

The STAGGER_RETRIES code in lib/canonical/testing/layers.py was something I removed in my earlier zbuildout branch but should be added back. We can't remove it until we move to a newer version of zope.publisher, which we can't do yet because of other issues I won't get into right now.

[Edwin Grubbs (edwin-grubbs)]

Hi Gary,

This branch looks good. I only have suggestions for minor changes and
fixing the lint items that are possible.

merge-conditional

-Edwin

{{{
= Launchpad lint =

== Pyflakes notices ==

lib/canonical/launchpad/testing/pages.py
    28: 'urlparse' imported but unused

lib/canonical/testing/layers.py
    75: 'HTTPPublication' imported but unused
    Traceback (most recent call last):
    File "/usr/bin/pyflakes", line 5, in <module>
    sys.exit(main(sys.argv[1:]))
    File "/usr/lib/python2.6/dist-packages/pyflakes/scripts/pyflakes.py", line 57, in main
    warnings += checkPath(arg)

TypeError
    unsupported operand type(s) for +=: 'int' and 'NoneType'

== Pylint notices ==

lib/lazr/__init__.py
    1: [F0001] No module named lib/lazr/__init__

lib/canonical/launchpad/testing/pages.py
    621: [C0301] Line too long (79/78)
    42: [F0401] Unable to import 'lazr.restful.testing.webservice' (No module named restful)
    55: [E1002, UnstickyCookieHTTPCaller.__init__] Use super on an old style class
    63: [E1002, UnstickyCookieHTTPCaller.__call__] Use super on an old style class
    71: [E1002, UnstickyCookieHTTPCaller.chooseRequestClass] Use super on an old style class
    28: [W0611] Unused import urlparse

lib/canonical/testing/layers.py
    75: [W0611] Unused import HTTPPublication
}}}

>=== modified file 'lib/canonical/launchpad/pagetests/webservice/root.txt'
>--- lib/canonical/launchpad/pagetests/webservice/root.txt 2009-03-18 17:20:01 +0000
>+++ lib/canonical/launchpad/pagetests/webservice/root.txt 2009-08-26 22:51:00 +0000
>@@ -5,9 +5,8 @@
> confusion when one program runs as different users, this is
> implemented as a redirect to that person's canonical URL.
>
>- >>> print webservice.get('/people/+me').getOutput()
>+ >>> print webservice.get('/people/+me')
> HTTP/1.1 303 See Other
> ...
> Location: http://.../~salgado
> ...
>-
>
>=== modified file 'lib/canonical/launchpad/pagetests/webservice/xx-hwdb.txt'
>--- lib/canonical/launchpad/pagetests/webservice/xx-hwdb.txt 2009-08-14 13:03:36 +0000
>+++ lib/canonical/launchpad/pagetests/webservice/xx-hwdb.txt 2009-08-26 22:51:00 +0000
>@@ -537,7 +537,7 @@
> Accessing the raw submission data yields a redirect to a Librarian URL.
>
> >>> print webservice.get(submission['raw_submission_link'])
>- HTTP/1.1 303 See Other
>+ HTTP/1.1 303 See Other...
> Content-Length: 0
> Content-Type: text/plain
> Location: http://localhost:58000/92/sample-submission-2.xml
>@@ -769,7 +769,7 @@
>
> A vendor ID can be accessed by via its database ID.
>
>- >>> vendor_id = webservice.get('+hwdb/+hwvendorid/1').jsonBody()
>+ >>> vendor_id = webservice.get('/+hwdb/+hwvendorid/1').jsonBody()
> >>> pprint_entry(vendor_id)
> bus: u'System'
> id: 1
>
>=== modified file 'lib/canonical/launchpad/pagetests/webservice/xx-person.txt'
>--- lib/canonical/launchpad/pagetests/webservice/xx-person.txt 2009-08-13 15:12:16 +0000
>+++ lib/canonical/launchpad/pagetests/webservice/xx-person.txt 2009-08-26 22:51:00 +0000
>@@ -387,7 +387,7 @@
> ... u'wikiname': 'MrExample'}
> >>> response = webservice.patch(
> ... wiki_name['self_link'], 'applicat...

review: Approve (code)

[Gary Poster (gary)]

On Aug 27, 2009, at 12:19 AM, Edwin Grubbs wrote:

> Review: Approve code
> Hi Gary,
>
> This branch looks good. I only have suggestions for minor changes and
> fixing the lint items that are possible.

Thank you Edwin!

I fixed all the lint issues except for pylint not findling
lazr.restful. I glanced at that; looks like somebody has already
tried to improve this, but its not quite there yet, and I could not
make it better with a quick fly-by.

I'm only responding to the questions in-line, and then putting the
incremental diff at the end.

>> def addHeadersTo(self, full_url, full_headers):
>> if (self.consumer is not None and self.access_token is not
>> None):
>> @@ -123,6 +120,8 @@
>> request.sign_request(OAuthSignatureMethod_PLAINTEXT(),
>> self.consumer, self.access_token)
>> full_headers.update(request.to_header(OAUTH_REALM))
>> + if not self.handle_errors:
>> + full_headers['X_Zope_handle_errors'] = 'False'
>
>
>
> Is this why the webservice object in tests no longer raises an
> exception?

No, that's because we were relying on jsonBody raising an exception,
and it still does, but now it is a "this isn't json!" exception rather
than a useful report of the response status and the server's traceback.

> def extract_url_parameter(url, parameter):
>> @@ -619,7 +618,7 @@
>> access_token = request_token.createAccessToken()
>> logout()
>> return LaunchpadWebServiceCaller(
>> - consumer_key, access_token.key, port=9000)
>> + consumer_key, access_token.key) # "port=9000" was ignored,
>> now not sent
>
>
> I don't think this comment is necessary. If it needs to stay, it's
> too long, needs a period, and I've been dinged for using eol comments,
> although I don't see anything in the style guide about that.

:-) Cool. Removed.

...

>>
>> === modified file 'lib/canonical/testing/layers.py'
>> --- lib/canonical/testing/layers.py 2009-08-21 19:38:21 +0000
>> +++ lib/canonical/testing/layers.py 2009-08-26 22:51:00 +0000
>> @@ -69,7 +69,10 @@
>> import psycopg2
>> from storm.zope.interfaces import IZStorm
>> import transaction
>> +import wsgi_intercept
>>
>> +from zope.app.publication.httpfactory import chooseClasses
>> +from zope.app.publication.http import HTTPPublication
>> import zope.app.testing.functional
>> from zope.app.testing.functional import FunctionalTestSetup,
>> ZopePublication
>> from zope.component import getUtility, provideUtility
>> @@ -752,6 +755,47 @@
>> "DELETE FROM SessionData")
>>
>>
>> +def wsgi_application(environ, start_response):
>> + """This is a wsgi application for Zope functional testing.
>> +
>> + We use it with wsgi_intercept, which is itself mostly
>> interesting
>> + for our webservice (lazr.restful) tests.
>> + """
>> + # Committing work done up to now is a convenience that the Zope
>> + # zope.app.testing.functional.HTTPCaller does. We're
>> replacing that bit,
>> + # so it is easiest to follow that lead, even if it feels a
>> little loose.
>> + transaction.commit()
>> + # Let's support post-mortem debugging.
>> + if environ.get('HTTP_X_ZOPE_...

=== modified file 'lib/canonical/launchpad/pagetests/webservice/root.txt'
--- lib/canonical/launchpad/pagetests/webservice/root.txt	2009-03-18 17:20:01 +0000
+++ lib/canonical/launchpad/pagetests/webservice/root.txt	2009-08-20 04:46:48 +0000
@@ -5,9 +5,8 @@
 confusion when one program runs as different users, this is
 implemented as a redirect to that person's canonical URL.
 
-  >>> print webservice.get('/people/+me').getOutput()
+  >>> print webservice.get('/people/+me')
   HTTP/1.1 303 See Other
   ...
   Location: http://.../~salgado
   ...
-

=== modified file 'lib/canonical/launchpad/pagetests/webservice/xx-hwdb.txt'
--- lib/canonical/launchpad/pagetests/webservice/xx-hwdb.txt	2009-08-14 13:03:36 +0000
+++ lib/canonical/launchpad/pagetests/webservice/xx-hwdb.txt	2009-08-21 19:49:18 +0000
@@ -537,7 +537,7 @@
 Accessing the raw submission data yields a redirect to a Librarian URL.
 
     >>> print webservice.get(submission['raw_submission_link'])
-    HTTP/1.1 303 See Other
+    HTTP/1.1 303 See Other...
     Content-Length: 0
     Content-Type: text/plain
     Location: http://localhost:58000/92/sample-submission-2.xml
@@ -769,7 +769,7 @@
 
 A vendor ID can be accessed by via its database ID.
 
-    >>> vendor_id = webservice.get('+hwdb/+hwvendorid/1').jsonBody()
+    >>> vendor_id = webservice.get('/+hwdb/+hwvendorid/1').jsonBody()
     >>> pprint_entry(vendor_id)
     bus: u'System'
     id: 1

=== modified file 'lib/canonical/launchpad/pagetests/webservice/xx-person.txt'
--- lib/canonical/launchpad/pagetests/webservice/xx-person.txt	2009-08-13 15:12:16 +0000
+++ lib/canonical/launchpad/pagetests/webservice/xx-person.txt	2009-08-21 19:49:18 +0000
@@ -387,7 +387,7 @@
     ...    u'wikiname': 'MrExample'}
     >>> response = webservice.patch(
     ...     wiki_name['self_link'], 'application/json', dumps(patch))
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 400 Bad Request
     ...
     wiki: The URI scheme "javascript" is not allowed.

=== modified file 'lib/canonical/launchpad/pagetests/webservice/xx-private-membership.txt'
--- lib/canonical/launchpad/pagetests/webservice/xx-private-membership.txt	2009-07-15 09:42:45 +0000
+++ lib/canonical/launchpad/pagetests/webservice/xx-private-membership.txt	2009-08-20 04:46:48 +0000
@@ -101,7 +101,7 @@
     ...                    simplejson.dumps(representation),
     ...                    headers)
 
-    >>> print modify_team('~my-new-team', {'visibility' : 'Private Membership'},
+    >>> print modify_team('/~my-new-team', {'visibility' : 'Private Membership'},
     ...     'PATCH', comm_webservice)
     HTTP/1.1 209 Content Returned
     ...
@@ -116,7 +116,7 @@
 
 As an admin, Salgado can also change the team's visibility.
 
-    >>> print modify_team('~my-new-team', {'visibility' : 'Public'},
+    >>> print modify_team('/~my-new-team', {'visibility' : 'Public'},
     ...     'PATCH', webservice)
     HTTP/1.1 209 Content Returned
     ...
@@ -131,7 +131,7 @@
 
 An unprivileged user is not able to change the visibility.
 
-    >>> print modify_team('~my-new-team', {'visibility' : 'Private Membership'},
+    >>> print modify_team('/~my-new-team', {'visibility' : 'Private Membership'},
     ...     'PATCH', user_webservice)
     HTTP/1.1 401 Unauthorized
     ...

=== modified file 'lib/canonical/launchpad/pagetests/webservice/xx-project-registry.txt'
--- lib/canonical/launchpad/pagetests/webservice/xx-project-registry.txt	2009-08-13 15:12:16 +0000
+++ lib/canonical/launchpad/pagetests/webservice/xx-project-registry.txt	2009-08-21 19:49:18 +0000
@@ -173,10 +173,8 @@
 name.  As a convenience, requests for projects using the wrong case
 are redirected to the correct location.
 
-    >>> firefox = webservice.get('/FireFox').jsonBody()
-    Traceback (most recent call last):
-    ...
-    ValueError: HTTP/1.1 301 Moved Permanently
+    >>> print webservice.get('/FireFox')
+    HTTP/1.1 301 Moved Permanently
     ...
     Location: http://api.launchpad.dev/beta/firefox
     ...
@@ -578,15 +576,17 @@
     Mega Money Maker
 
 The use of "licensing_search" is restricted to commercial admins.
-Attempting to access it as a normal users results in an exception.
+Attempting to access it as a normal users is unauthorized.
 
-    >>> proprietary = user_webservice.named_get(
+    >>> print user_webservice.named_get(
     ...     "/projects", "licensing_search",
-    ...     licenses=["Other/Proprietary"]).jsonBody()
+    ...     licenses=["Other/Proprietary"])
+    HTTP/1.1 401 Unauthorized
+    ...
     Traceback (most recent call last):
     ...
-    ValueError: HTTP/1.1 401 Unauthorized
-    ...
+    Unauthorized: (...)
+    <BLANKLINE>
 
 The project collection has a method for creating a new project.
 
@@ -996,14 +996,14 @@
     >>> url = '/firefox/trunk/0.9.2/+file/firefox-0.9.2.orig.tar.gz/file'
     >>> response = webservice.put(url, 'application/x-tar-gz', 'fakefiledata')
     >>> print response
-    HTTP/1.1 405 Method Not Allowed
+    HTTP/1.1 405 Method Not Allowed...
     Allow: GET
     ...
 
     >>> url = '/firefox/trunk/0.9.2/+file/firefox-0.9.2.orig.tar.gz/signature'
     >>> response = webservice.put(url, 'pgpapplication/data', 'signaturedata')
     >>> print response
-    HTTP/1.1 405 Method Not Allowed
+    HTTP/1.1 405 Method Not Allowed...
     Allow: GET
     ...
 

=== modified file 'lib/canonical/launchpad/pagetests/webservice/xx-service.txt'
--- lib/canonical/launchpad/pagetests/webservice/xx-service.txt	2009-07-16 22:15:11 +0000
+++ lib/canonical/launchpad/pagetests/webservice/xx-service.txt	2009-08-20 04:46:48 +0000
@@ -77,6 +77,7 @@
 request to http://api.launchpad.net/beta/, but with the links pointing
 to a different host.
 
+    >>> webservice.domain = 'bugs.launchpad.dev'
     >>> root = webservice.get(
     ...     'http://bugs.launchpad.dev/api/beta/').jsonBody()
     >>> print root['people_collection_link']
@@ -87,7 +88,8 @@
 
     >>> from canonical.launchpad.testing.pages import (
     ...     LaunchpadWebServiceCaller)
-    >>> noauth_webservice = LaunchpadWebServiceCaller()
+    >>> noauth_webservice = LaunchpadWebServiceCaller(
+    ...     domain='bugs.launchpad.dev')
     >>> sample_auth = 'Basic %s' % '[e-mail]:test'.encode('base64')
     >>> print noauth_webservice.get(
     ...     'http://bugs.launchpad.dev/api/beta/people/+me',
@@ -100,9 +102,9 @@
 But the regular authentication still doesn't work on the normal API
 virtual host:
 
+    >>> noauth_webservice.domain = 'api.launchpad.dev'
     >>> print noauth_webservice.get(
     ...     'http://api.launchpad.dev/beta/people/+me',
     ...     headers={'Authorization': sample_auth})
     HTTP/1.1 401 Unauthorized
     ...
-

=== modified file 'lib/canonical/launchpad/pagetests/webservice/xx-wadl.txt'
--- lib/canonical/launchpad/pagetests/webservice/xx-wadl.txt	2009-06-12 16:36:02 +0000
+++ lib/canonical/launchpad/pagetests/webservice/xx-wadl.txt	2009-08-20 04:46:48 +0000
@@ -10,7 +10,7 @@
 canonical/launchpad/apidoc/wadl-development.xml.
 
     >>> test_wadl = webservice.get(
-    ...     '/', 'application/vd.sun.wadl+xml').getBody()
+    ...     '/', 'application/vd.sun.wadl+xml').body
     >>> print test_wadl
     <?xml version="1.0"?>
     <wadl:application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -32,7 +32,7 @@
     >>> WebServiceApplication.cached_wadl = None
 
     >>> wadl = webservice.get(
-    ...     '/', 'application/vd.sun.wadl+xml').getBody()
+    ...     '/', 'application/vd.sun.wadl+xml').body
     >>> wadl = wadl.decode('UTF-8')
 
 The real file is much bigger than the test file.

=== modified file 'lib/canonical/launchpad/testing/googletestservice.py'
--- lib/canonical/launchpad/testing/googletestservice.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/testing/googletestservice.py	2009-08-25 21:39:10 +0000
@@ -108,7 +108,7 @@
         sock.close() # Clean up.
 
 
-def wait_for_service(timeout=10.0):
+def wait_for_service(timeout=15.0):
     """Poll the service and BLOCK until we can connect to it.
 
     :param timeout: The socket should timeout after this many seconds.

=== modified file 'lib/canonical/launchpad/testing/pages.py'
--- lib/canonical/launchpad/testing/pages.py	2009-08-20 06:53:22 +0000
+++ lib/canonical/launchpad/testing/pages.py	2009-08-21 19:49:18 +0000
@@ -25,7 +25,7 @@
     BeautifulSoup, Comment, Declaration, NavigableString, PageElement,
     ProcessingInstruction, SoupStrainer, Tag)
 from contrib.oauth import OAuthRequest, OAuthSignatureMethod_PLAINTEXT
-from urlparse import urljoin
+from urlparse import urljoin, urlparse
 
 from zope.app.testing.functional import HTTPCaller, SimpleCookie
 from zope.component import getUtility
@@ -87,10 +87,9 @@
 class LaunchpadWebServiceCaller(WebServiceCaller):
     """A class for making calls to Launchpad web services."""
 
-    base_url = 'http://api.launchpad.dev'
-
     def __init__(self, oauth_consumer_key=None, oauth_access_key=None,
-                 handle_errors=True, *args, **kwargs):
+                 handle_errors=True, domain='api.launchpad.dev',
+                 protocol='http'):
         """Create a LaunchpadWebServiceCaller.
         :param oauth_consumer_key: The OAuth consumer key to use.
         :param oauth_access_key: The OAuth access key to use for the request.
@@ -111,9 +110,7 @@
             self.access_token = None
 
         self.handle_errors = handle_errors
-
-        # Set up a delegate to make the actual HTTP calls.
-        self.http_caller = UnstickyCookieHTTPCaller(*args, **kwargs)
+        WebServiceCaller.__init__(self, handle_errors, domain, protocol)
 
     def addHeadersTo(self, full_url, full_headers):
         if (self.consumer is not None and self.access_token is not None):
@@ -123,6 +120,8 @@
             request.sign_request(OAuthSignatureMethod_PLAINTEXT(),
                                  self.consumer, self.access_token)
             full_headers.update(request.to_header(OAUTH_REALM))
+        if not self.handle_errors:
+            full_headers['X_Zope_handle_errors'] = 'False'
 
 
 def extract_url_parameter(url, parameter):
@@ -619,7 +618,7 @@
     access_token = request_token.createAccessToken()
     logout()
     return LaunchpadWebServiceCaller(
-        consumer_key, access_token.key, port=9000)
+        consumer_key, access_token.key) # "port=9000" was ignored, now not sent
 
 
 def stop():

=== modified file 'lib/canonical/lazr/testing/layers.py'
--- lib/canonical/lazr/testing/layers.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/lazr/testing/layers.py	2009-08-17 19:16:23 +0000
@@ -1,9 +1,20 @@
 # 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.layers
-__all__.extend(lazr.restful.testing.layers.__all__)
-from lazr.restful.testing.layers import *
+"""Miscellaneous testing helpers."""
+
+__metaclass__ = type
+__all__ = [
+    'MockRootFolder',
+]
+
+class MockRootFolder:
+    """Implement the minimum functionality required by Z3 ZODB dependencies
+
+    Installed as part of FunctionalLayer.testSetUp() to allow the http()
+    method (zope.app.testing.functional.HTTPCaller) to work.
+    """
+    @property
+    def _p_jar(self):
+        return self
+    def sync(self):
+        pass

=== modified file 'lib/canonical/testing/layers.py'
--- lib/canonical/testing/layers.py	2009-08-21 19:38:21 +0000
+++ lib/canonical/testing/layers.py	2009-08-25 19:09:14 +0000
@@ -69,7 +69,10 @@
 import psycopg2
 from storm.zope.interfaces import IZStorm
 import transaction
+import wsgi_intercept
 
+from zope.app.publication.httpfactory import chooseClasses
+from zope.app.publication.http import HTTPPublication
 import zope.app.testing.functional
 from zope.app.testing.functional import FunctionalTestSetup, ZopePublication
 from zope.component import getUtility, provideUtility
@@ -752,6 +755,47 @@
             "DELETE FROM SessionData")
 
 
+def wsgi_application(environ, start_response):
+    """This is a wsgi application for Zope functional testing.
+
+    We use it with wsgi_intercept, which is itself mostly interesting
+    for our webservice (lazr.restful) tests.
+    """
+    # Committing work done up to now is a convenience that the Zope
+    # zope.app.testing.functional.HTTPCaller does.  We're replacing that bit,
+    # so it is easiest to follow that lead, even if it feels a little loose.
+    transaction.commit()
+    # Let's support post-mortem debugging.
+    if environ.get('HTTP_X_ZOPE_HANDLE_ERRORS') == 'False':
+        environ['wsgi.handleErrors'] = False
+    if 'HTTP_X_ZOPE_HANDLE_ERRORS' in environ:
+        del environ['HTTP_X_ZOPE_HANDLE_ERRORS']
+    handle_errors = environ.get('wsgi.handleErrors', True)
+    # Now we do the proper dance to get the desired request.  This is an
+    # almalgam of code from zope.app.testing.functional.HTTPCaller and
+    # zope.publisher.paste.Application.
+    request_cls, publication_cls = chooseClasses(
+        environ['REQUEST_METHOD'], environ)
+    publication = publication_cls(FunctionalTestSetup().db)
+    request = request_cls(environ['wsgi.input'], environ)
+    request.setPublication(publication)
+    # The rest of this function is an amalgam of
+    # zope.publisher.paste.Application.__call__ and van.testing.layers.
+    request = zope.publisher.publish.publish(
+        request, handle_errors=handle_errors)
+    response = request.response
+    # We sort these, and then put the status first, because
+    # zope.testbrowser.testing does--and because it makes it easier to write
+    # reliable tests.
+    headers = sorted(response.getHeaders())
+    status = response.getStatusString()
+    headers.insert(0, ('Status', status))
+    # Start the WSGI server response.
+    start_response(status, headers)
+    # Return the result body iterable.
+    return response.consumeBodyIter()
+
+
 class FunctionalLayer(BaseLayer):
     """Loads the Zope3 component architecture in appserver mode."""
 
@@ -773,11 +817,14 @@
         # they're defined by Python code, we need to call that code
         # here.
         register_launchpad_request_publication_factories()
+        wsgi_intercept.add_wsgi_intercept(
+            'localhost', 80, lambda: wsgi_application)
 
     @classmethod
     @profiled
     def tearDown(cls):
         FunctionalLayer.isSetUp = False
+        wsgi_intercept.remove_wsgi_intercept('localhost', 80)
         # Signal Layer cannot be torn down fully
         raise NotImplementedError
 
@@ -1279,6 +1326,11 @@
             access_logger.log(MockHTTPTask(response._response, first_line))
             return response
 
+        # Setting STAGGER_RETRIES makes tests like notfound-traversals.txt go
+        # much, much faster by avoiding calls to time.sleep()
+        cls._original_stagger_retries = zope.publisher.http.STAGGER_RETRIES
+        zope.publisher.http.STAGGER_RETRIES = False
+
         PageTestLayer.orig__call__ = (
                 zope.app.testing.functional.HTTPCaller.__call__)
         zope.app.testing.functional.HTTPCaller.__call__ = my__call__
@@ -1290,6 +1342,7 @@
         PageTestLayer.resetBetweenTests(True)
         zope.app.testing.functional.HTTPCaller.__call__ = (
                 PageTestLayer.orig__call__)
+        zope.publisher.http.STAGGER_RETRIES = cls._original_stagger_retries
         if PageTestLayer.profiler:
             PageTestLayer.profiler.dump_stats(
                 os.environ.get('PROFILE_PAGETESTS_REQUESTS'))

=== removed directory 'lib/lazr'
=== removed file 'lib/lazr/__init__.py'
--- lib/lazr/__init__.py	2009-06-02 08:20:49 +0000
+++ lib/lazr/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-# This is a namespace package for lazr.* packages.  We should absolutely get rid
-# of this once we are using eggs.
-import warnings
-warnings.filterwarnings(
-    'ignore',
-    'Module .+ was already imported from .+, but .+ is being added.*',
-    UserWarning)
-
-import pkg_resources
-pkg_resources.declare_namespace('lazr')

=== removed symlink 'lib/lazr/batchnavigator'
=== target was u'../../sourcecode/lazr.batchnavigator/src/lazr/batchnavigator'
=== removed symlink 'lib/lazr/config'
=== target was u'../../sourcecode/lazr.config/src/lazr/config'
=== removed symlink 'lib/lazr/delegates'
=== target was u'../../sourcecode/lazr.delegates/src/lazr/delegates'
=== removed symlink 'lib/lazr/enum'
=== target was u'../../sourcecode/lazr.enum/src/lazr/enum'
=== removed symlink 'lib/lazr/lifecycle'
=== target was u'../../sourcecode/lazr.lifecycle/src/lazr/lifecycle'
=== removed symlink 'lib/lazr/restful'
=== target was u'../../sourcecode/lazr.restful/src/lazr/restful/'
=== modified file 'lib/lp/bugs/stories/webservice/xx-bug-target.txt'
--- lib/lp/bugs/stories/webservice/xx-bug-target.txt	2009-06-12 16:36:02 +0000
+++ lib/lp/bugs/stories/webservice/xx-bug-target.txt	2009-08-20 04:46:48 +0000
@@ -30,8 +30,8 @@
     ...          u'Include your credit-card details, mwuh'}
     >>> response = user_webservice.patch(
     ...     product['self_link'], 'application/json', dumps(patch))
-    >>> print response.getOutput()
-    HTTP/1.1 401 Unauthorized
+    >>> print response
+    HTTP/1.1 401 Unauthorized...
     Content-Length: ...
     Content-Type: text/plain
     X-Lazr-Oopsid: OOPS-...
@@ -117,4 +117,3 @@
     ...     '/testix', 'application/json',
     ...     dumps({'official_bug_tags': [u'foo', u'bar']}))
     HTTP/1.1 209 Content Returned...
-

=== modified file 'lib/lp/bugs/stories/webservice/xx-bug.txt'
--- lib/lp/bugs/stories/webservice/xx-bug.txt	2009-08-22 16:01:03 +0000
+++ lib/lp/bugs/stories/webservice/xx-bug.txt	2009-08-25 19:09:14 +0000
@@ -245,7 +245,7 @@
 There is no top-level collection of messages; they only exist in
 relation to some bug.
 
-  >>> webservice.get("/messages").getStatus()
+  >>> webservice.get("/messages").status
   404
 
 We can add a new message to a bug by calling the newMessage method.
@@ -254,7 +254,7 @@
   ...     "/bugs/5", 'newMessage',
   ...     subject='A new message',
   ...     content='This is a new message added through the webservice API.')
-  HTTP/1.1 201 Created
+  HTTP/1.1 201 Created...
   Content-Length: 0
   Content-Type: text/plain
   Location: http://api.launchpad.dev/beta/firefox/+bug/5/comments/1
@@ -273,7 +273,7 @@
   >>> print webservice.named_post(
   ...     "/bugs/5", 'newMessage',
   ...     content='This is a new message with no subject.')
-  HTTP/1.1 201 Created
+  HTTP/1.1 201 Created...
   Content-Length: 0
   Content-Type: text/plain
   Location: http://api.launchpad.dev/beta/firefox/+bug/5/comments/2
@@ -334,7 +334,7 @@
 
 The collection of bug tasks is not exposed as a resource:
 
-  >>> webservice.get("/bug_tasks").getStatus()
+  >>> webservice.get("/bug_tasks").status
   404
 
 It's possible to change the task's assignee.
@@ -823,7 +823,7 @@
 
 The collection of bug watches is not exposed as a resource:
 
-  >>> webservice.get("/bug_watches").getStatus()
+  >>> webservice.get("/bug_watches").status
   404
 
 We can modify the remote bug.
@@ -844,8 +844,8 @@
   >>> patch = {u'url': u'http://www.example.com/'}
   >>> response = webservice.patch(
   ...     bug_watch_2000['self_link'], 'application/json', dumps(patch))
-  >>> print response.getOutput()
-  HTTP/1.1 400 Bad Request
+  >>> print response
+  HTTP/1.1 400 Bad Request...
   Content-Length: 47
   Content-Type: text/plain
   ...
@@ -860,8 +860,8 @@
   ...     bug_tracker=webservice.getAbsoluteUrl(
   ...                      '/bugs/bugtrackers/mozilla.org'),
   ...     remote_bug='9876')
-  >>> print response.getOutput()
-  HTTP/1.1 201 Created
+  >>> print response
+  HTTP/1.1 201 Created...
   Content-Length: 0
   Content-Type: text/plain
   Location: http://.../bugs/1/+watch/13
@@ -922,8 +922,8 @@
   ...     }
   >>> response = webservice.patch(
   ...     bug_tracker['self_link'], 'application/json', dumps(patch))
-  >>> print response.getOutput()
-  HTTP/1.1 301 Moved Permanently
+  >>> print response
+  HTTP/1.1 301 Moved Permanently...
   Content-Length: 0
   Content-Type: text/plain
   Location: http://.../bugs/bugtrackers/bob
@@ -932,8 +932,8 @@
 Note the 301 response. We changed the name, so the API URL at which
 the bug tracker can be found has changed.
 
-  >>> print webservice.get(bug_tracker['self_link']).getOutput()
-  HTTP/1.1 404 Not Found
+  >>> print webservice.get(bug_tracker['self_link'])
+  HTTP/1.1 404 Not Found...
   Content-Length: ...
   Content-Type: text/plain
   X-Lazr-Oopsid: OOPS-...
@@ -969,10 +969,13 @@
 
     >>> print public_webservice.patch(
     ...     bug_tracker_path, 'application/json',
-    ...     dumps(dict(active=False))).jsonBody()
+    ...     dumps(dict(active=False)))
+    HTTP/1.1 401 Unauthorized
+    ...
     Traceback (most recent call last):
-      ...
-    ValueError: HTTP/1.1 401 Unauthorized...
+    ...
+    Unauthorized: (<BugTracker at ...>, 'active', 'launchpad.Admin')
+    <BLANKLINE>
 
 Admins can, however.
 
@@ -1002,8 +1005,8 @@
   ...     bug_one['self_link'], 'addAttachment',
   ...     data="12345", filename="numbers.txt", content_type='foo/bar',
   ...     comment="The numbers you asked for.")
-  >>> print response.getOutput()
-  HTTP/1.1 201 Created
+  >>> print response
+  HTTP/1.1 201 Created...
   Content-Length: 0
   Content-Type: text/plain
   Location: http://.../bugs/1/+attachment/1
@@ -1043,8 +1046,8 @@
 we must follow to download the data.
 
   >>> data_response = webservice.get(attachment['data_link'])
-  >>> print data_response.getOutput()
-  HTTP/1.1 303 See Other
+  >>> print data_response
+  HTTP/1.1 303 See Other...
   Content-Length: 0
   Content-Type: text/plain
   Location: http://localhost:58000/.../numbers.txt
@@ -1098,7 +1101,7 @@
 
   >>> response = webservice.put(
   ...     attachment['data_link'], 'text/text', 'abcdefg')
-  >>> print response.getOutput()
+  >>> print response
   HTTP/1.1 405 Method Not Allowed
   ...
 
@@ -1116,7 +1119,7 @@
 
   >>> response = webservice.named_post(
   ...     attachment['self_link'], 'removeFromBug')
-  >>> print response.getOutput()
+  >>> print response
   HTTP/1.1 200 Ok
   ...
 

=== modified file 'lib/lp/bugs/tests/test_bugs_webservice.py'
--- lib/lp/bugs/tests/test_bugs_webservice.py	2009-07-24 12:32:28 +0000
+++ lib/lp/bugs/tests/test_bugs_webservice.py	2009-08-20 04:46:48 +0000
@@ -40,7 +40,7 @@
 
     def findBugDescription(self, response):
         """Find the bug description field in an XHTML document fragment."""
-        soup = BeautifulSoup(response.consumeBody())
+        soup = BeautifulSoup(response.body)
         dt = soup.find('dt', text="description").parent
         dd = dt.findNextSibling('dd')
         return str(dd.contents.pop())
@@ -49,8 +49,7 @@
         response = self.webservice.get(
             '/bugs/' + str(self.bug_two.id),
             'application/xhtml+xml')
-
-        self.assertEqual(response.getStatus(), 200)
+        self.assertEqual(response.status, 200)
 
         self.assertEqual(
             self.findBugDescription(response),
@@ -70,7 +69,7 @@
             dumps(dict(description=new_description)),
             headers=dict(accept='application/xhtml+xml'))
 
-        self.assertEqual(response.getStatus(), 209)
+        self.assertEqual(response.status, 209)
 
         self.assertEqual(
             self.findBugDescription(response),
@@ -118,9 +117,9 @@
         response = self.webservice.get(
             self.message_path, 'application/xhtml+xml')
 
-        self.assertEqual(response.getStatus(), 200)
+        self.assertEqual(response.status, 200)
 
-        rendered_comment = response.consumeBody()
+        rendered_comment = response.body
         # XXX Bjorn Tillenius 2009-05-15 bug=377003
         # The current request is a web service request when rendering
         # the HTML, causing canonical_url to produce links pointing to the
@@ -137,4 +136,3 @@
 
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
-

=== modified file 'lib/lp/code/stories/webservice/xx-branchmergeproposal.txt'
--- lib/lp/code/stories/webservice/xx-branchmergeproposal.txt	2009-08-07 02:48:00 +0000
+++ lib/lp/code/stories/webservice/xx-branchmergeproposal.txt	2009-08-20 04:46:48 +0000
@@ -208,9 +208,9 @@
     ...     diff_content=diff_content,
     ...     diff_stat='M fooix.txt', source_revision_id='rev-a',
     ...     target_revision_id='rev-b', conflicts='oh, no conflicts')
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 200 Ok
-    Content-Length: ...
+    ...
     Content-Type: application/json
     Vary: ...
     ...
@@ -245,9 +245,9 @@
     ...     diff_content='',
     ...     diff_stat='', source_revision_id='rev-c',
     ...     target_revision_id='rev-d', conflicts=None)
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 200 Ok
-    Content-Length: ...
+    ...
     Content-Type: application/json
     Vary: ...
     ...

=== modified file 'lib/lp/soyuz/stories/webservice/xx-archive.txt'
--- lib/lp/soyuz/stories/webservice/xx-archive.txt	2009-08-13 15:12:16 +0000
+++ lib/lp/soyuz/stories/webservice/xx-archive.txt	2009-08-21 19:49:18 +0000
@@ -1,4 +1,5 @@
-= Archives =
+Archives
+========
 
 Representations for IArchive can be fetch via the API for PPAs and
 distribution archives.
@@ -101,12 +102,14 @@
 
 Attempting to grab a non-existent archive will result in a 404 error:
 
-    >>> bogus_archive = "ubuntutest/+archive/bogus"
-    >>> webservice.get(bogus_archive).jsonBody()
+    >>> bogus_archive = "http://api.launchpad.dev/beta/ubuntutest/+archive/bogus"
+    >>> print webservice.get(bogus_archive)
+    HTTP/1.1 404 Not Found
+    ...
     Traceback (most recent call last):
     ...
-    ValueError: HTTP/1.1 404 Not Found
-    ...
+    NotFound: Object: ..., name: u'bogus'
+    <BLANKLINE>
 
 
 = Archive Permissions =
@@ -224,7 +227,7 @@
 
     >>> print webservice.named_get(
     ...     ubuntu['main_archive_link'], 'getUploadersForPackage',
-    ...     source_package_name="badpackage").getOutput()
+    ...     source_package_name="badpackage")
     HTTP/1.1 400 Bad Request
     ...
 
@@ -236,7 +239,7 @@
     ...     ubuntu['main_archive_link'], 'newPackageUploader', {},
     ...     person=name12['self_link'],
     ...     source_package_name='mozilla-firefox')
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 201 Created
     ...
 
@@ -279,7 +282,7 @@
 
     >>> print webservice.named_get(
     ...     ubuntu['main_archive_link'], 'getUploadersForComponent',
-    ...     component_name="badcomponent").getOutput()
+    ...     component_name="badcomponent")
     HTTP/1.1 400 Bad Request
     ...
 
@@ -297,7 +300,7 @@
     ...     ubuntu['main_archive_link'], 'newComponentUploader', {},
     ...     person=name12['self_link'],
     ...     component_name='restricted')
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 201 Created
     ...
 
@@ -318,7 +321,7 @@
     >>> response = webservice.named_post(
     ...     cprov_archive['self_link'], 'newComponentUploader', {},
     ...     person=name12['self_link'], component_name='restricted')
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 400 Bad Request
     ...
     InvalidComponent: Component for PPAs should be 'main'
@@ -327,7 +330,7 @@
     >>> response = webservice.named_post(
     ...     cprov_archive['self_link'], 'newComponentUploader', {},
     ...     person=name12['self_link'], component_name='main')
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 201 Created
     ...
 
@@ -382,7 +385,7 @@
     ...     ubuntu['main_archive_link'], 'newQueueAdmin', {},
     ...     person=name12['self_link'],
     ...     component_name='partner')
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 201 Created
     ...
 
@@ -425,7 +428,7 @@
 
     >>> missing_type_url = '/ubuntu/+archive/primary/+upload/name12?item=firefox'
     >>> this_will_fail = webservice.get(missing_type_url)
-    >>> print this_will_fail.getOutput()
+    >>> print this_will_fail
     HTTP/1.1 404 Not Found
     ...
 
@@ -434,7 +437,7 @@
 
     >>> wrong_type_url = '/ubuntu/+archive/primary/+upload/name12?type=packageset&item=firefox&type=Integer'
     >>> this_will_fail = webservice.get(missing_type_url)
-    >>> print this_will_fail.getOutput()
+    >>> print this_will_fail
     HTTP/1.1 404 Not Found
     ...
 
@@ -442,7 +445,7 @@
 
     >>> missing_item_url = '/ubuntu/+archive/primary/+upload/name12?type=packageset'
     >>> this_will_fail = webservice.get(missing_type_url)
-    >>> print this_will_fail.getOutput()
+    >>> print this_will_fail
     HTTP/1.1 404 Not Found
     ...
 
@@ -451,7 +454,7 @@
 
     >>> wrong_type_url = '/ubuntu/+archive/primary/+upload/name12?type=packageset&item=firefox&item=vapourware'
     >>> this_will_fail = webservice.get(missing_type_url)
-    >>> print this_will_fail.getOutput()
+    >>> print this_will_fail
     HTTP/1.1 404 Not Found
     ...
 
@@ -626,7 +629,7 @@
 syncSources is invoked directly by the client, and any problems are
 the client's fault. Therefore, there's no need to record an OOPS.
 
-    >>> 'X-Lazr-Oopsid' in already_copied.getOutput()
+    >>> 'X-Lazr-Oopsid' in str(already_copied)
     False
 
 'syncSources' behaves trasactionally, i.e. it will only synchronise
@@ -749,7 +752,7 @@
     >>> response = mark_webservice.named_post(
     ...     mark_archive['self_link'], 'newSubscription',
     ...     subscriber=cprov_archive['owner_link'])
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 400 Bad Request
     ...
     ArchiveNotPrivate: Only private archives can have subscriptions.
@@ -763,7 +766,7 @@
     ...     cprov_archive['self_link'], 'newSubscription',
     ...     subscriber=mark['self_link'])
 
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 201 Created
     ...
 
@@ -789,7 +792,7 @@
 
     >>> response = user_webservice.get(
     ...     response.getHeader('Location'))
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 401 Unauthorized
     ...
 
@@ -800,7 +803,7 @@
     >>> response = user_webservice.named_post(
     ...     cprov_archive['self_link'], 'newSubscription',
     ...     subscriber=cprov_archive['owner_link'])
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 401 Unauthorized
     ...
 
@@ -810,7 +813,7 @@
     >>> response = cprov_webservice.named_post(
     ...     cprov_archive['self_link'], 'newSubscription',
     ...     subscriber=mark['self_link'])
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 400 Bad Request
     ...
     AlreadySubscribed: Mark Shuttleworth already has a current subscription

=== modified file 'lib/lp/soyuz/stories/webservice/xx-binary-package-publishing.txt'
--- lib/lp/soyuz/stories/webservice/xx-binary-package-publishing.txt	2009-04-28 12:59:43 +0000
+++ lib/lp/soyuz/stories/webservice/xx-binary-package-publishing.txt	2009-08-20 04:46:48 +0000
@@ -110,7 +110,7 @@
 
     >>> cprov_bins_response = webservice.named_get(
     ...     cprov_archive['self_link'], 'getPublishedBinaries')
-    >>> print cprov_bins_response.getOutput()
+    >>> print cprov_bins_response
     HTTP/1.1 200 Ok
     ...
 
@@ -118,7 +118,7 @@
 
     >>> response = user_webservice.named_get(
     ...     cprov_archive['self_link'], 'getPublishedBinaries')
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 401 Unauthorized
     ...
 
@@ -127,7 +127,6 @@
 
     >>> private_publication_url = pubs['entries'][0]['self_link']
     >>> response = user_webservice.get(private_publication_url)
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 401 Unauthorized
     ...
-

=== modified file 'lib/lp/soyuz/stories/webservice/xx-packageset.txt'
--- lib/lp/soyuz/stories/webservice/xx-packageset.txt	2009-07-25 16:33:39 +0000
+++ lib/lp/soyuz/stories/webservice/xx-packageset.txt	2009-08-20 04:46:48 +0000
@@ -12,7 +12,7 @@
 
 The actual package set *functionality* is tested in much greater detail
 here:
-    
+
     lib/lp/soyuz/doc/packageset.txt
 
 Please refer to the tests contained in the file above if you are really
@@ -29,7 +29,7 @@
     ...     '/package-sets', 'new', {},
     ...     name=u'umbrella', description=u'Contains all source packages',
     ...     owner=name12['self_link'])
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 201 Created
     ...
 
@@ -67,7 +67,7 @@
 
     >>> response = webservice.named_get(
     ...     '/package-sets', 'getByName', {}, name=u'not-found')
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 400 Bad Request
     ...
     NoSuchPackageSet: No such packageset: 'not-found'.
@@ -83,7 +83,7 @@
     >>> response = webservice.named_post(
     ...     '/package-sets/umbrella', 'addSources', {},
     ...     names=[spn.name for spn in all_spns])
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 200 Ok
     ...
 
@@ -93,7 +93,7 @@
     >>> response = webservice.named_post(
     ...     '/package-sets/umbrella', 'addSources', {},
     ...     names=[u'does-not-exist'])
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 200 Ok
     ...
     null
@@ -101,7 +101,7 @@
     >>> response = webservice.named_post(
     ...     '/package-sets/umbrella', 'removeSources', {},
     ...     names=[u'does-not-exist'])
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 200 Ok
     ...
     null
@@ -110,7 +110,7 @@
 
     >>> response = webservice.named_get(
     ...     '/package-sets/umbrella', 'getSourcesIncluded', {})
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 200 Ok
     ...
     ["a52dec",
@@ -138,7 +138,7 @@
     >>> response = webservice.named_post(
     ...     '/package-sets/umbrella', 'removeSources', {},
     ...     names=["foobar", "iceweasel"])
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 200 Ok
     ...
 
@@ -147,7 +147,7 @@
 
     >>> response = webservice.named_get(
     ...     '/package-sets/umbrella', 'getSourcesIncluded', {})
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 200 Ok
     ...
     ["a52dec",
@@ -183,7 +183,7 @@
 
     >>> response = webservice.named_get(
     ...     '/package-sets/umbrella', 'setsIncluded', {})
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 200 Ok
     ...
     {"total_size": 0, "start": null, "entries": []}
@@ -194,7 +194,7 @@
     ...     '/package-sets', 'new', {},
     ...     name=u'gnome', description=u'Contains all gnome packages',
     ...     owner=name12['self_link'])
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 201 Created
     ...
 
@@ -202,7 +202,7 @@
     ...     '/package-sets', 'new', {},
     ...     name=u'mozilla', description=u'Contains all mozilla packages',
     ...     owner=name12['self_link'])
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 201 Created
     ...
 
@@ -210,7 +210,7 @@
     ...     '/package-sets', 'new', {},
     ...     name=u'firefox', description=u'Contains all firefox packages',
     ...     owner=name12['self_link'])
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 201 Created
     ...
 
@@ -219,7 +219,7 @@
     ...     name=u'thunderbird',
     ...     description=u'Contains all thunderbird packages',
     ...     owner=name12['self_link'])
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 201 Created
     ...
 
@@ -228,7 +228,7 @@
     ...     name=u'languagepack',
     ...     description=u'Contains all languagepack packages',
     ...     owner=name12['self_link'])
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 201 Created
     ...
 
@@ -247,27 +247,27 @@
     >>> response = webservice.named_post(
     ...     '/package-sets/umbrella', 'addSubsets', {},
     ...     names=[u'gnome', u'mozilla'])
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 200 Ok
     ...
 
     >>> response = webservice.named_post(
     ...     '/package-sets/gnome', 'addSubsets', {}, names=[u'languagepack'])
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 200 Ok
     ...
 
     >>> response = webservice.named_post(
     ...     '/package-sets/thunderbird', 'addSubsets', {},
     ...     names=[u'languagepack'])
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 200 Ok
     ...
 
     >>> response = webservice.named_post(
     ...     '/package-sets/mozilla', 'addSubsets', {},
     ...     names=[u'firefox', u'thunderbird'])
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 200 Ok
     ...
 
@@ -277,7 +277,7 @@
     >>> response = webservice.named_post(
     ...     '/package-sets/thunderbird', 'addSubsets', {},
     ...     names=[u'does-not-exist'])
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 200 Ok
     ...
     null
@@ -285,7 +285,7 @@
     >>> response = webservice.named_post(
     ...     '/package-sets/thunderbird', 'removeSubsets', {},
     ...     names=[u'does-not-exist'])
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 200 Ok
     ...
     null
@@ -337,7 +337,7 @@
     >>> response = webservice.named_post(
     ...     '/package-sets/thunderbird', 'removeSubsets', {},
     ...     names=[u'languagepack'])
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 200 Ok
     ...
 
@@ -355,13 +355,13 @@
     >>> response = webservice.named_post(
     ...     '/package-sets/firefox', 'addSources', {},
     ...     names=['at', 'mozilla-firefox', 'language-pack-de'])
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 200 Ok
     ...
 
     >>> response = webservice.named_get(
     ...     '/package-sets/firefox', 'getSourcesIncluded', {})
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 200 Ok
     ...
     ["at", "language-pack-de", "mozilla-firefox"]
@@ -369,13 +369,13 @@
     >>> response = webservice.named_post(
     ...     '/package-sets/thunderbird', 'addSources', {},
     ...     names=['at', 'cnews', 'thunderbird', 'language-pack-de'])
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 200 Ok
     ...
 
     >>> response = webservice.named_get(
     ...     '/package-sets/thunderbird', 'getSourcesIncluded', {})
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 200 Ok
     ...
     ["at", "cnews", "language-pack-de", "thunderbird"]
@@ -405,7 +405,7 @@
     >>> response = webservice.named_get(
     ...     '/package-sets/', 'setsIncludingSource', {},
     ...     sourcepackagename=u'does-not-exist')
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 400 Bad Request
     ...
     No such source package: 'does-not-exist'.
@@ -418,7 +418,7 @@
     >>> response = webservice.named_get(
     ...     '/package-sets/firefox', 'getSourcesSharedBy', {},
     ...     other_package_set=thunderbird['self_link'])
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 200 Ok
     ...
     ["at", "language-pack-de"]
@@ -428,7 +428,7 @@
     >>> response = webservice.named_get(
     ...     '/package-sets/firefox', 'getSourcesNotSharedBy', {},
     ...     other_package_set=thunderbird['self_link'])
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 200 Ok
     ...
     ["mozilla-firefox"]
@@ -437,7 +437,7 @@
     >>> response = webservice.named_get(
     ...     '/package-sets/thunderbird', 'getSourcesNotSharedBy', {},
     ...     other_package_set=firefox['self_link'])
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 200 Ok
     ...
     ["cnews", "thunderbird"]
@@ -462,7 +462,7 @@
     ...     ubuntu['main_archive_link'], 'newPackagesetUploader', {},
     ...     person=name12['self_link'],
     ...     packageset='firefox')
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 201 Created
     ...
 
@@ -490,7 +490,7 @@
     ...     ubuntu['main_archive_link'], 'newPackagesetUploader', {},
     ...     person=name12['self_link'],
     ...     packageset='mozilla')
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 201 Created
     ...
 
@@ -519,7 +519,7 @@
     ...     ubuntu['main_archive_link'], 'deletePackagesetUploader', {},
     ...     person=name12['self_link'],
     ...     packageset='mozilla')
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 200 Ok
     ...
 
@@ -539,7 +539,7 @@
     ...     ubuntu['main_archive_link'], 'newPackagesetUploader', {},
     ...     person=cprov['self_link'],
     ...     packageset='mozilla')
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 201 Created
     ...
 
@@ -547,7 +547,7 @@
     ...     ubuntu['main_archive_link'], 'newPackagesetUploader', {},
     ...     person=cprov['self_link'],
     ...     packageset='thunderbird')
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 201 Created
     ...
 

=== modified file 'lib/lp/soyuz/stories/webservice/xx-source-package-publishing.txt'
--- lib/lp/soyuz/stories/webservice/xx-source-package-publishing.txt	2009-07-10 09:14:41 +0000
+++ lib/lp/soyuz/stories/webservice/xx-source-package-publishing.txt	2009-08-20 04:46:48 +0000
@@ -179,7 +179,7 @@
 
     >>> cprov_srcs_response = webservice.named_get(
     ...     cprov_archive['self_link'], 'getPublishedSources')
-    >>> print cprov_srcs_response.getOutput()
+    >>> print cprov_srcs_response
     HTTP/1.1 200 Ok
     ...
 
@@ -187,7 +187,7 @@
 
     >>> response = user_webservice.named_get(
     ...     cprov_archive['self_link'], 'getPublishedSources')
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 401 Unauthorized
     ...
 
@@ -196,7 +196,7 @@
 
     >>> private_publication_url = pubs['entries'][0]['self_link']
     >>> response = user_webservice.get(private_publication_url)
-    >>> print response.getOutput()
+    >>> print response
     HTTP/1.1 401 Unauthorized
     ...
 
@@ -252,7 +252,7 @@
     >>> cprov_srcs = cprov_srcs_response.jsonBody()
     >>> src_link = cprov_srcs['entries'][0]['self_link']
 
-The src_link will be of the form: 
+The src_link will be of the form:
 u'http://api.launchpad.dev/beta/~cprov/+archive/ppa/+sourcepub/27'
 so:
 
@@ -283,4 +283,3 @@
     >>> print_build_summaries(build_summaries)
     Source ID 27: FAILEDTOBUILD ([u'i386'])
     Source ID 28: FULLYBUILT_PENDING ([u'i386'])
-

=== modified file 'setup.py'
--- setup.py	2009-08-05 18:52:52 +0000
+++ setup.py	2009-08-17 19:16:23 +0000
@@ -30,6 +30,12 @@
         'feedvalidator',
         'funkload',
         'launchpadlib',
+        'lazr.batchnavigator',
+        'lazr.config',
+        'lazr.delegates',
+        'lazr.enum',
+        'lazr.lifecycle',
+        'lazr.restful',
         'lazr.smtptest',
         'lazr.uri',
         'mechanize',

=== modified file 'utilities/sourcedeps.conf'
--- utilities/sourcedeps.conf	2009-08-14 17:26:21 +0000
+++ utilities/sourcedeps.conf	2009-08-17 19:16:23 +0000
@@ -3,13 +3,7 @@
 bzr-svn=lp:~launchpad-pqm/bzr-svn/devel/
 dulwich=lp:~launchpad-pqm/dulwich/devel/
 launchpad-loggerhead=lp:~launchpad-pqm/launchpad-loggerhead/devel/
-lazr.batchnavigator=lp:~launchpad-pqm/lazr.batchnavigator/trunk/
-lazr.config=lp:~launchpad-pqm/lazr.config/devel/
-lazr.delegates=lp:~launchpad-pqm/lazr.delegates/devel/
-lazr.enum=lp:~launchpad-pqm/lazr.enum/trunk/
 lazr-js=lp:~launchpad-pqm/lazr-js/toolchain/
-lazr.lifecycle=lp:~launchpad-pqm/lazr.lifecycle/trunk/
-lazr.restful=lp:~launchpad-pqm/lazr.restful/trunk/
 loggerhead=lp:~launchpad-pqm/loggerhead/devel/
 mailman=lp:~launchpad-pqm/mailman/2.1/
 pygpgme=lp:~launchpad-pqm/pygpgme/devel/

=== modified file 'versions.cfg'
--- versions.cfg	2009-08-24 21:21:35 +0000
+++ versions.cfg	2009-08-25 21:39:10 +0000
@@ -11,14 +11,20 @@
 ctypes = 1.0.2
 docutils = 0.5
 elementtree = 1.2.6-20050316
+epydoc = 3.0.1
 feedvalidator = 0.0.0DEV-r1049
 functest = 0.8.7
 funkload = 1.10.0
 httplib2 = 0.4.0
 ipython = 0.9.1
-jquery.javascript = 1.0.0
-jquery.layer = 1.0.0
-launchpadlib = 1.0.3
+launchpadlib = 1.5.1
+lazr.batchnavigator = 1.0
+lazr.config = 1.1.3
+lazr.delegates = 1.0.1
+lazr.enum = 1.1.1
+lazr.lifecycle = 0.1
+lazr.restful = 0.9.5
+lazr.restfulclient = 0.9.4
 lazr.smtptest = 1.1
 lazr.uri = 1.0.1
 mechanize = 0.1.7b
@@ -30,6 +36,7 @@
 python-openid = 2.2.1
 pytz = 2009j
 RestrictedPython = 3.4.2
+roman = 1.4.0
 setuptools = 0.6c9
 simplejson = 2.0.9
 simplesettings = 0.4
@@ -38,10 +45,12 @@
 storm = 0.15
 transaction = 1.0a1
 uuid = 1.30
-wadllib = 0.1
+van.testing = 2.0.1
+wadllib = 1.1.3
 webunit = 1.3.8
 windmill = 1.2
 wsgi-fileserver = 0.2.7
+wsgi-intercept = 0.4
 wsgi-jsonrpc = 0.2.8
 wsgi-xmlrpc = 0.2.7
 z3c.coverage = 1.1.2
@@ -153,7 +162,6 @@
 zope.pagetemplate = 3.4.0
 zope.proxy = 3.5.0
 zope.publisher = 3.5.6
-zope.rdb = 3.4.0
 zope.schema = 3.5.4
 zope.security = 3.7.1
 zope.securitypolicy = 3.4.1
@@ -167,6 +175,5 @@
 zope.testbrowser = 3.4.2
 zope.testing = 3.8.1
 zope.thread = 3.4
-# zope.traversing = 3.5.2
 zope.traversing = 3.4.1
 zope.viewlet = 3.4.2