/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/remote.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-05-06 03:06:18 UTC
  • mfrom: (7500.1.2 trunk-merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200506030618-131sjbc876q7on66
Merge the 3.1 branch.

Merged from https://code.launchpad.net/~jelmer/brz/trunk-merge-3.1/+merge/383481

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transport/remote.py
20
20
imported from breezy.bzr.smart.
21
21
"""
22
22
 
23
 
from __future__ import absolute_import
24
 
 
25
23
__all__ = ['RemoteTransport', 'RemoteTCPTransport', 'RemoteSSHTransport']
26
24
 
27
25
from io import BytesIO
37
35
from ..bzr import (
38
36
    remote,
39
37
    )
40
 
from ..sixish import PY3
41
38
from ..bzr.smart import client, medium
42
39
 
43
40
 
472
469
    def list_dir(self, relpath):
473
470
        resp = self._call2(b'list_dir', self._remote_path(relpath))
474
471
        if resp[0] == b'names':
475
 
            return [name.decode('utf-8') if PY3 else name for name in resp[1:]]
 
472
            return [name.decode('utf-8') for name in resp[1:]]
476
473
        raise errors.UnexpectedSmartServerResponse(resp)
477
474
 
478
475
    def iter_files_recursive(self):
479
476
        resp = self._call2(b'iter_files_recursive', self._remote_path(''))
480
477
        if resp[0] == b'names':
481
 
            return [name.decode('utf-8') if PY3 else name for name in resp[1:]]
 
478
            return [name.decode('utf-8') for name in resp[1:]]
482
479
        raise errors.UnexpectedSmartServerResponse(resp)
483
480
 
484
481