126
scheme_end, path_start = _find_scheme_and_separator(base)
127
if scheme_end is None and path_start is None:
129
elif path_start is None:
130
path_start = len(base)
131
path = base[path_start:]
121
match = _url_scheme_re.match(base)
124
scheme = match.group('scheme')
125
path = match.group('path').split('/')
126
if path[-1:] == ['']:
127
# Strip off a trailing slash
128
# This helps both when we are at the root, and when
129
# 'base' has an extra slash at the end
132
path = base.split('/')
134
if scheme is not None and len(path) >= 1:
136
# the path should be represented as an abs path.
137
# we know this must be absolute because of the presence of a URL scheme.
139
path = [''] + path[1:]
141
# create an empty host, but dont alter the path - this might be a
142
# relative url fragment.
133
arg_scheme_end, arg_path_start = _find_scheme_and_separator(arg)
134
if arg_scheme_end is None and arg_path_start is None:
136
elif arg_path_start is None:
137
arg_path_start = len(arg)
138
if arg_scheme_end is not None:
140
path = arg[arg_path_start:]
141
scheme_end = arg_scheme_end
142
path_start = arg_path_start
147
match = _url_scheme_re.match(arg)
150
scheme = match.group('scheme')
151
# this skips .. normalisation, making http://host/../../..
153
path = match.group('path').split('/')
154
# set the host and path according to new absolute URL, discarding
155
# any previous values.
156
# XXX: duplicates mess from earlier in this function. This URL
157
# manipulation code needs some cleaning up.
158
if scheme is not None and len(path) >= 1:
161
# url scheme implies absolute path.
164
# no url scheme we take the path as is.
167
path = '/'.join(path)
144
168
path = joinpath(path, arg)
145
return base[:path_start] + path
169
path = path.split('/')
170
if remove_root and path[0:1] == ['']:
173
# Remove the leading slash from the path, so long as it isn't also the
174
# trailing slash, which we want to keep if present.
175
if path and path[0] == '' and len(path) > 1:
180
return '/'.join(path)
181
return scheme + '://' + '/'.join(path)
148
184
def joinpath(base, *args):
304
339
:param url: Either a hybrid URL or a local path
305
340
:return: A normalized URL which only includes 7-bit ASCII characters.
307
scheme_end, path_start = _find_scheme_and_separator(url)
308
if scheme_end is None:
342
m = _url_scheme_re.match(url)
309
344
return local_path_to_url(url)
310
prefix = url[:path_start]
311
path = url[path_start:]
345
scheme = m.group('scheme')
346
path = m.group('path')
312
347
if not isinstance(url, unicode):
314
349
if c not in _url_safe_characters:
315
350
raise errors.InvalidURL(url, 'URLs can only contain specific'
316
351
' safe characters (not %r)' % c)
317
352
path = _url_hex_escapes_re.sub(_unescape_safe_chars, path)
318
return str(prefix + ''.join(path))
353
return str(scheme + '://' + ''.join(path))
320
355
# We have a unicode (hybrid) url
321
356
path_chars = list(path)
434
469
return url_base + head, tail
437
def split_segment_parameters_raw(url):
438
"""Split the subsegment of the last segment of a URL.
440
:param url: A relative or absolute URL
441
:return: (url, subsegments)
443
(parent_url, child_dir) = split(url)
444
subsegments = child_dir.split(",")
445
if len(subsegments) == 1:
447
return (join(parent_url, subsegments[0]), subsegments[1:])
450
def split_segment_parameters(url):
451
"""Split the segment parameters of the last segment of a URL.
453
:param url: A relative or absolute URL
454
:return: (url, segment_parameters)
456
(base_url, subsegments) = split_segment_parameters_raw(url)
458
for subsegment in subsegments:
459
(key, value) = subsegment.split("=", 1)
460
parameters[key] = value
461
return (base_url, parameters)
464
def join_segment_parameters_raw(base, *subsegments):
465
"""Create a new URL by adding subsegments to an existing one.
467
This adds the specified subsegments to the last path in the specified
468
base URL. The subsegments should be bytestrings.
470
:note: You probably want to use join_segment_parameters instead.
474
for subsegment in subsegments:
475
if type(subsegment) is not str:
476
raise TypeError("Subsegment %r is not a bytestring" % subsegment)
477
if "," in subsegment:
478
raise errors.InvalidURLJoin(", exists in subsegments",
480
return ",".join((base,) + subsegments)
483
def join_segment_parameters(url, parameters):
484
"""Create a new URL by adding segment parameters to an existing one.
486
The parameters of the last segment in the URL will be updated; if a
487
parameter with the same key already exists it will be overwritten.
489
:param url: A URL, as string
490
:param parameters: Dictionary of parameters, keys and values as bytestrings
492
(base, existing_parameters) = split_segment_parameters(url)
494
new_parameters.update(existing_parameters)
495
for key, value in parameters.iteritems():
496
if type(key) is not str:
497
raise TypeError("parameter key %r is not a bytestring" % key)
498
if type(value) is not str:
499
raise TypeError("parameter value %r for %s is not a bytestring" %
502
raise errors.InvalidURLJoin("= exists in parameter key", url,
504
new_parameters[key] = value
505
return join_segment_parameters_raw(base,
506
*["%s=%s" % item for item in sorted(new_parameters.items())])
509
472
def _win32_strip_local_trailing_slash(url):
510
473
"""Strip slashes after the drive letter"""
511
474
if len(url) > WIN32_MIN_ABS_FILEURL_LENGTH:
added
removed
bzrlib/urlutils.py
