Merge lp:~mwhudson/bzr/file-localhost-paths-are-ok into lp:bzr

[Michael Hudson-Doyle]

[Michael Hudson-Doyle (mwhudson)]

bzrlib.urlutils.local_path_from_url doesn't accept file://localhost/ URLs and this (together with Launchpad only accepting them for equally daft reasons) finally annoyed me enough to submit this patch.

I'll try to fix Launchpad too :-)

[Robert Collins (lifeless)]

doit

review: Approve

=== modified file 'NEWS'
--- NEWS	2009-11-26 01:42:06 +0000
+++ NEWS	2009-11-26 04:15:20 +0000
@@ -54,6 +54,10 @@
 Improvements
 ************
 
+* ``bzrlib.urlutils.local_path_from_url`` now accepts
+  'file://localhost/' as well as 'file:///' URLs on POSIX.  (Michael
+  Hudson)
+
 Documentation
 *************
 

=== modified file 'bzrlib/tests/test_urlutils.py'
--- bzrlib/tests/test_urlutils.py	2009-04-04 01:45:09 +0000
+++ bzrlib/tests/test_urlutils.py	2009-11-26 04:15:20 +0000
@@ -17,7 +17,6 @@
 """Tests for the urlutils wrapper."""
 
 import os
-import re
 import sys
 
 from bzrlib import osutils, urlutils, win32utils
@@ -300,8 +299,13 @@
             from_url('file:///path/to/r%C3%A4ksm%C3%B6rg%C3%A5s'))
         self.assertEqual(u'/path/to/r\xe4ksm\xf6rg\xe5s',
             from_url('file:///path/to/r%c3%a4ksm%c3%b6rg%c3%a5s'))
+        self.assertEqual(u'/path/to/r\xe4ksm\xf6rg\xe5s',
+            from_url('file://localhost/path/to/r%c3%a4ksm%c3%b6rg%c3%a5s'))
 
         self.assertRaises(InvalidURL, from_url, '/path/to/foo')
+        self.assertRaises(
+            InvalidURL, from_url,
+            'file://remotehost/path/to/r%c3%a4ksm%c3%b6rg%c3%a5s')
 
     def test_win32_local_path_to_url(self):
         to_url = urlutils._win32_local_path_to_url

=== modified file 'bzrlib/urlutils.py'
--- bzrlib/urlutils.py	2009-07-16 07:10:45 +0000
+++ bzrlib/urlutils.py	2009-11-26 04:15:20 +0000
@@ -217,10 +217,16 @@
 # jam 20060502 Sorted to 'l' because the final target is 'local_path_from_url'
 def _posix_local_path_from_url(url):
     """Convert a url like file:///path/to/foo into /path/to/foo"""
-    if not url.startswith('file:///'):
-        raise errors.InvalidURL(url, 'local urls must start with file:///')
+    file_localhost_prefix = 'file://localhost/'
+    if url.startswith(file_localhost_prefix):
+        path = url[len(file_localhost_prefix) - 1:]
+    elif not url.startswith('file:///'):
+        raise errors.InvalidURL(
+            url, 'local urls must start with file:/// or file://localhost/')
+    else:
+        path = url[len('file://'):]
     # We only strip off 2 slashes
-    return unescape(url[len('file://'):])
+    return unescape(path)
 
 
 def _posix_local_path_to_url(path):