/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/transport/__init__.py

  • Committer: Andrew Bennetts
  • Date: 2008-05-07 22:47:56 UTC
  • mfrom: (3412 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3414.
  • Revision ID: andrew.bennetts@canonical.com-20080507224756-upxgmud0bdo4ysuf
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/__init__.py
50
50
        deprecated_function,
51
51
        DEPRECATED_PARAMETER,
52
52
        one_four,
53
 
        zero_ninety,
54
53
        )
55
54
from bzrlib.trace import (
56
55
    mutter,
179
178
        transport_list_registry.remove(scheme)
180
179
 
181
180
 
182
 
 
183
 
@deprecated_function(zero_ninety)
184
 
def split_url(url):
185
 
    # TODO: jam 20060606 urls should only be ascii, or they should raise InvalidURL
186
 
    if isinstance(url, unicode):
187
 
        url = url.encode('utf-8')
188
 
    (scheme, netloc, path, params,
189
 
     query, fragment) = urlparse.urlparse(url, allow_fragments=False)
190
 
    username = password = host = port = None
191
 
    if '@' in netloc:
192
 
        username, host = netloc.split('@', 1)
193
 
        if ':' in username:
194
 
            username, password = username.split(':', 1)
195
 
            password = urllib.unquote(password)
196
 
        username = urllib.unquote(username)
197
 
    else:
198
 
        host = netloc
199
 
 
200
 
    if ':' in host:
201
 
        host, port = host.rsplit(':', 1)
202
 
        try:
203
 
            port = int(port)
204
 
        except ValueError:
205
 
            # TODO: Should this be ConnectionError?
206
 
            raise errors.TransportError(
207
 
                'invalid port number %s in url:\n%s' % (port, url))
208
 
    host = urllib.unquote(host)
209
 
 
210
 
    path = urllib.unquote(path)
211
 
 
212
 
    return (scheme, username, password, host, port, path)
213
 
 
214
 
 
215
181
class _CoalescedOffset(object):
216
182
    """A data container for keeping track of coalesced offsets."""
217
183
 
1540
1506
        return transport
1541
1507
 
1542
1508
 
1543
 
@deprecated_function(zero_ninety)
1544
 
def urlescape(relpath):
1545
 
    urlutils.escape(relpath)
1546
 
 
1547
 
 
1548
 
@deprecated_function(zero_ninety)
1549
 
def urlunescape(url):
1550
 
    urlutils.unescape(url)
1551
 
 
1552
1509
# We try to recognize an url lazily (ignoring user, password, etc)
1553
1510
_urlRE = re.compile(r'^(?P<proto>[^:/\\]+)://(?P<rest>.*)$')
1554
1511