/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 breezy/location.py

  • Committer: Jelmer Vernooij
  • Date: 2020-03-07 14:46:08 UTC
  • mfrom: (7490.3.7 work)
  • mto: This revision was merged to the branch mainline in revision 7497.
  • Revision ID: jelmer@jelmer.uk-20200307144608-3yx04ocg1lb5mqk4
Merge brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/location.py
17
17
 
18
18
"""UI location string handling."""
19
19
 
20
 
from __future__ import absolute_import
21
 
 
22
20
import re
23
21
 
24
22
from . import (
25
23
    urlutils,
26
24
    )
27
25
from .hooks import Hooks
28
 
from .sixish import (
29
 
    PY3,
30
 
    string_types,
31
 
    )
32
26
 
33
27
 
34
28
class LocationHooks(Hooks):
102
96
    :raise InvalidURL: If the location is already a URL, but not valid.
103
97
    :return: Byte string with resulting URL
104
98
    """
105
 
    if not isinstance(location, string_types):
 
99
    if not isinstance(location, str):
106
100
        raise AssertionError("location not a byte or unicode string")
107
101
 
108
102
    if location.startswith(':pserver:'):
120
114
                path=location, extra='URLs must be properly escaped')
121
115
        location = urlutils.local_path_to_url(location)
122
116
    else:
123
 
        if PY3:
124
 
            location = location.decode('ascii')
 
117
        location = location.decode('ascii')
125
118
 
126
119
    if location.startswith("file:") and not location.startswith("file://"):
127
120
        return urlutils.join(urlutils.local_path_to_url("."), location[5:])