Merge lp:~gary/lazr.restful/fix-webservice-testing-infrastructure into lp:lazr.restful

[Gary Poster]

[Gary Poster (gary)]

Fixes testing infrastructure and packaging problems.

[Leonard Richardson (leonardr)]

> Fixes testing infrastructure and packaging problems.

I have two comments.

1. Why the heck is 'roman' a dependency of lazr.restful? It's not in the code and it's such a random thing to need.

2. This comment isn't terribly helpful.

70 + # We want the initial slash of the path, so we subtract 1 from
71 + # the base_url's len.

I'd prefer something like:

# We want just one character of the base_url (the slash that begins the path), so we cut
# off the length of the base_url minus one character.

review: Needs Information

[lp:~gary/lazr.restful/fix-webservice-testing-infrastructure]

62. By Gary Poster on 2009-08-25

the missing roman dependency was because my copy of docutils had been built with a Python that had roman, and docutils tries to be clever so that meant the egg was broken for a Python without roman. removing dependency.

63. By Gary Poster on 2009-08-25

make a better comment, per review by leonardr

[Gary Poster (gary)]

On Aug 25, 2009, at 8:29 AM, Leonard Richardson wrote:

> Review: Needs Information
>> Fixes testing infrastructure and packaging problems.
>
> I have two comments.
>
> 1. Why the heck is 'roman' a dependency of lazr.restful? It's not in
> the code and it's such a random thing to need.

I was surprised too, but my tests failed in a clean Python (that is, a
vanilla Python with only the standard library) without it. That said,
I investigated further after you asked. It turns out that docutils
tries to do something tricky, and my version of docutils had broken
the trick. I rebuilt docutils and we're all good. Therefore, I
removed that indirect dependency from the list.

> 2. This comment isn't terribly helpful.
>
> 70 + # We want the initial slash of the path, so we subtract 1 from
> 71 + # the base_url's len.
>
> I'd prefer something like:
>
> # We want just one character of the base_url (the slash that begins
> the path), so we cut
> # off the length of the base_url minus one character.

Yes, good improvement. I took it a little further, as you can see in
the incremental diff below.

Thanks

Gary

=== modified file 'setup.py'
--- setup.py 2009-08-20 04:18:09 +0000
+++ setup.py 2009-08-25 13:46:54 +0000
@@ -61,7 +61,6 @@
          'lazr.enum',
          'lazr.lifecycle',
          'lazr.uri',
- 'roman',
          'setuptools',
          'simplejson',
          'van.testing',

=== modified file 'src/lazr/restful/testing/webservice.py'
--- src/lazr/restful/testing/webservice.py 2009-08-20 04:18:09 +0000
+++ src/lazr/restful/testing/webservice.py 2009-08-25 14:04:09 +0000
@@ -211,8 +211,9 @@
                          'preceding slash?)',
                          path_or_url)
              else:
- # We want the initial slash of the path, so we
subtract 1 from
- # the base_url's len.
+ # The base_url ends with a slash. We want that slash
to begin
+ # the path, so we cut off the length of the base_url
minus one
+ # character.
                  full_url = path_or_url[len(base_url)-1:]
          full_headers = {'Host': self.domain}
          if headers is not None:

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2009-03-23 19:17:56 +0000
+++ MANIFEST.in	2009-08-20 12:23:08 +0000
@@ -1,2 +1,4 @@
+include ez_setup.py
+recursive-include src *.txt *.pt *.zcml
 exclude MANIFEST.in buildout.cfg bootstrap.py .bzrignore
 prune _bootstrap

=== modified file 'setup.py'
--- setup.py	2009-08-14 20:25:45 +0000
+++ setup.py	2009-08-20 04:18:09 +0000
@@ -61,6 +61,7 @@
         'lazr.enum',
         'lazr.lifecycle',
         'lazr.uri',
+        'roman',
         'setuptools',
         'simplejson',
         'van.testing',

=== modified file 'src/lazr/restful/NEWS.txt'
--- src/lazr/restful/NEWS.txt	2009-08-19 17:17:30 +0000
+++ src/lazr/restful/NEWS.txt	2009-08-20 04:45:22 +0000
@@ -15,6 +15,11 @@
 For services that use Django, added an adapter from Django's
 ObjectDoesNotExist to lazr.restful's NotFoundView.
 
+Fixed some testing infrastructure in lazr.restful.testing.webservice.
+
+Added "roman" to build dependencies.
+
+Fix some critical packaging problems.
 
 0.9.4 (2009-08-17)
 ==================

=== modified file 'src/lazr/restful/testing/webservice.py'
--- src/lazr/restful/testing/webservice.py	2009-08-18 15:47:10 +0000
+++ src/lazr/restful/testing/webservice.py	2009-08-20 04:18:09 +0000
@@ -8,7 +8,6 @@
     'ExampleWebServicePublication',
     'FakeRequest',
     'FakeResponse',
-    'MockRootFolder',
     'pprint_entry',
     'WebServiceTestPublication',
     'WebServiceTestRequest',
@@ -183,7 +182,7 @@
             #   /firefox = http://foo.dev/firefox
             #   /firefox = http://api.foo.dev/beta/firefox
             resource_path = resource_path[1:]
-        url_with_version = '/'.join(api_version, resource_path)
+        url_with_version = '/'.join((api_version, resource_path))
         return urljoin(self.base_url, url_with_version)
 
     def addHeadersTo(self, url, headers):
@@ -206,9 +205,15 @@
         else:
             base_url = self.base_url
             if not path_or_url.startswith(base_url):
-                raise ValueError('not a testing url', path_or_url)
+                raise ValueError(
+                        'not a testing url '
+                        '(maybe you wanted a relative url but left off the '
+                        'preceding slash?)',
+                        path_or_url)
             else:
-                full_url = path_or_url[len(base_url):]
+                # We want the initial slash of the path, so we subtract 1 from
+                # the base_url's len.
+                full_url = path_or_url[len(base_url)-1:]
         full_headers = {'Host': self.domain}
         if headers is not None:
             full_headers.update(headers)
@@ -354,4 +359,3 @@
     def __str__(self):
         return "http://dummy"
     __call__ = __str__
-

=== modified file 'src/lazr/restful/version.txt'
--- src/lazr/restful/version.txt	2009-08-17 16:24:44 +0000
+++ src/lazr/restful/version.txt	2009-08-20 04:18:09 +0000
@@ -1,1 +1,1 @@
-0.9.4
+0.9.5