Merge lp:~jkakar/txfluiddb/endpoint-trailing-slash into lp:txfluiddb

[Jamu Kakar]

This branch introduces the following changes:

- A trailing slash is automatically appended to a base URL that
  doesn't have one when an Endpoint is instantiated.

[Terry Jones (terrycojones)]

Looks fine to me. I'm of course not sure if Tristan will want this change. I also hit this problem once.

[Tristan Seligmann (mithrandi)]

review: Approve

=== modified file 'txfluiddb/client.py'
--- txfluiddb/client.py	2010-06-12 21:47:47 +0000
+++ txfluiddb/client.py	2010-06-13 21:57:24 +0000
@@ -428,6 +428,8 @@
         if creds is not None and not isinstance(creds, BasicCreds):
             raise ValueError('Only basic authentication is supported')
 
+        if not baseURL.endswith("/"):
+            baseURL = baseURL + "/"
         self.baseURL = baseURL
         self.version = version
         self.creds = creds

=== modified file 'txfluiddb/test/test_client.py'
--- txfluiddb/test/test_client.py	2010-06-12 21:47:47 +0000
+++ txfluiddb/test/test_client.py	2010-06-13 21:57:24 +0000
@@ -570,6 +570,16 @@
         self.assertEqual(endpoint.baseURL, url)
 
 
+    def test_addTrailingSlash(self):
+        """
+        If the base URL doesn't have a trailing slash, one will be added
+        automatically.
+        """
+        url = 'http://fluiddb.url'
+        endpoint = Endpoint(url)
+        self.assertEqual(endpoint.baseURL, 'http://fluiddb.url/')
+
+
     def test_defaultEndpoint(self):
         """
         Endpoint defaults to the real, global FluidDB endpoint.