← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/stub_sftp.py

[merge] win32

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/stub_sftp.py
22
22
import os
23
23
from paramiko import ServerInterface, SFTPServerInterface, SFTPServer, SFTPAttributes, \
24
24
    SFTPHandle, SFTP_OK, AUTH_SUCCESSFUL, OPEN_SUCCEEDED
 
25
from bzrlib.osutils import pathjoin
25
26
 
26
27
 
27
28
class StubServer (ServerInterface):
69
70
            out = [ ]
70
71
            flist = os.listdir(path)
71
72
            for fname in flist:
72
 
                attr = SFTPAttributes.from_stat(os.stat(os.path.join(path, fname)))
 
73
                attr = SFTPAttributes.from_stat(os.stat(pathjoin(path, fname)))
73
74
                attr.filename = fname
74
75
                out.append(attr)
75
76
            return out
93
94
    def open(self, path, flags, attr):
94
95
        path = self._realpath(path)
95
96
        try:
 
97
            if hasattr(os, 'O_BINARY'):
 
98
                flags |= os.O_BINARY
96
99
            fd = os.open(path, flags)
97
100
        except OSError, e:
98
101
            return SFTPServer.convert_errno(e.errno)
99
102
        if (flags & os.O_CREAT) and (attr is not None):
100
103
            SFTPServer.set_file_attr(path, attr)
101
104
        if flags & os.O_WRONLY:
102
 
            fstr = 'w'
 
105
            fstr = 'wb'
103
106
        elif flags & os.O_RDWR:
104
 
            fstr = 'r+'
 
107
            fstr = 'rb+'
105
108
        else:
106
109
            # O_RDONLY (== 0)
107
 
            fstr = 'r'
 
110
            fstr = 'rb'
108
111
        try:
109
112
            f = os.fdopen(fd, fstr)
110
113
        except OSError, e: