/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

Support user.signingkey configuration variable in .git/config.

Merged from https://code.launchpad.net/~jelmer/brz/local-git-key/+merge/381000

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