/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/transport/gio_transport.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-02-14 03:16:54 UTC
  • mfrom: (7479.2.3 no-more-python2)
  • Revision ID: breezy.the.bot@gmail.com-20200214031654-bp1xtv2jr9nmhto3
Drop python2 support.

Merged from https://code.launchpad.net/~jelmer/brz/no-more-python2/+merge/378694

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transport/gio_transport.py
31
31
import random
32
32
import stat
33
33
import time
34
 
try:
35
 
    from urllib.parse import (
36
 
        urlparse,
37
 
        urlunparse,
38
 
        )
39
 
except ImportError:
40
 
    from urlparse import (
41
 
        urlparse,
42
 
        urlunparse,
43
 
        )
 
34
from urllib.parse import (
 
35
    urlparse,
 
36
    urlunparse,
 
37
    )
44
38
 
45
39
from .. import (
46
40
    config,
50
44
    debug,
51
45
    ui,
52
46
    )
53
 
from ..sixish import (
54
 
    text_type,
55
 
    )
56
47
from ..trace import mutter
57
48
from . import (
58
49
    FileStream,
154
145
 
155
146
    def _relpath_to_url(self, relpath):
156
147
        full_url = urlutils.join(self.url, relpath)
157
 
        if isinstance(full_url, text_type):
 
148
        if isinstance(full_url, str):
158
149
            raise urlutils.InvalidURL(full_url)
159
150
        return full_url
160
151