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

  • Committer: Martin
  • Date: 2017-05-24 23:30:47 UTC
  • mto: This revision was merged to the branch mainline in revision 6633.
  • Revision ID: gzlist@googlemail.com-20170524233047-5etu6ukzpgaxbw3y
Fix per_versionedfile test failures and rethink future_builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transport/sftp.py
27
27
 
28
28
import bisect
29
29
import errno
30
 
from future_builtins import zip
31
30
import itertools
32
31
import os
33
32
import random
50
49
                           ParamikoNotPresent,
51
50
                           )
52
51
from ..osutils import fancy_rename
 
52
from ..sixish import (
 
53
    zip,
 
54
    )
53
55
from ..trace import mutter, warning
54
56
from ..transport import (
55
57
    FileFileStream,