[PATCH 04 of 11 RFC] url: use url.url in url.open()
Brodie Rao
brodie at bitheap.org
Sat Mar 26 01:29:39 CDT 2011
# HG changeset patch
# User Brodie Rao <brodie at bitheap.org>
# Date 1301119154 25200
# Node ID 68f0b0c5f68b09801bf9579f3eaca7c9f2c7b3e9
# Parent fad8cd15be754dd8956329b7c258e106b74429eb
url: use url.url in url.open()
diff --git a/mercurial/url.py b/mercurial/url.py
--- a/mercurial/url.py
+++ b/mercurial/url.py
@@ -7,7 +7,7 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
-import urllib, urllib2, urlparse, httplib, os, re, socket, cStringIO
+import urllib, urllib2, urlparse, httplib, os, socket, cStringIO
import __builtin__
from i18n import _
import keepalive, util
@@ -928,17 +928,13 @@ def opener(ui, authinfo=None):
opener.addheaders.append(('Accept', 'application/mercurial-0.1'))
return opener
-scheme_re = re.compile(r'^([a-zA-Z0-9+-.]+)://')
-
-def open(ui, url, data=None):
- scheme = None
- m = scheme_re.search(url)
- if m:
- scheme = m.group(1).lower()
- if not scheme:
- path = util.normpath(os.path.abspath(url))
- url = 'file://' + urllib.pathname2url(path)
+def open(ui, url_, data=None):
+ u = url(url_)
+ if u.scheme:
+ u.scheme = u.scheme.lower()
+ url_, authinfo = u.authinfo()
+ else:
+ path = util.normpath(os.path.abspath(url_))
+ url_ = 'file://' + urllib.pathname2url(path)
authinfo = None
- else:
- url, authinfo = getauthinfo(url)
- return opener(ui, authinfo).open(url, data)
+ return opener(ui, authinfo).open(url_, data)
More information about the Mercurial-devel
mailing list