diff options
| -rw-r--r-- | paramiko/sftp_server.py | 11 | ||||
| -rw-r--r-- | paramiko/sftp_si.py | 8 | ||||
| -rwxr-xr-x | tests/test_sftp.py | 22 |
3 files changed, 31 insertions, 10 deletions
diff --git a/paramiko/sftp_server.py b/paramiko/sftp_server.py index 0c122f78..86faad39 100644 --- a/paramiko/sftp_server.py +++ b/paramiko/sftp_server.py @@ -96,6 +96,7 @@ class SFTPServer (BaseSFTP, SubsystemHandler): def finish_subsystem(self): self.server.session_ended() + super(SFTPServer, self).finish_subsystem() # close any file handles that were left open (so we can return them to the OS quickly) for f in self.file_table.itervalues(): f.close() @@ -141,10 +142,12 @@ class SFTPServer (BaseSFTP, SubsystemHandler): @param attr: attributes to change. @type attr: L{SFTPAttributes} """ - if attr._flags & attr.FLAG_PERMISSIONS: - os.chmod(filename, attr.st_mode) - if attr._flags & attr.FLAG_UIDGID: - os.chown(filename, attr.st_uid, attr.st_gid) + if sys.platform != 'win32': + # mode operations are meaningless on win32 + if attr._flags & attr.FLAG_PERMISSIONS: + os.chmod(filename, attr.st_mode) + if attr._flags & attr.FLAG_UIDGID: + os.chown(filename, attr.st_uid, attr.st_gid) if attr._flags & attr.FLAG_AMTIME: os.utime(filename, (attr.st_atime, attr.st_mtime)) if attr._flags & attr.FLAG_SIZE: diff --git a/paramiko/sftp_si.py b/paramiko/sftp_si.py index bcda61cf..4f0fc615 100644 --- a/paramiko/sftp_si.py +++ b/paramiko/sftp_si.py @@ -271,9 +271,13 @@ class SFTPServerInterface (object): The default implementation returns C{os.path.normpath('/' + path)}. """ if os.path.isabs(path): - return os.path.normpath(path) + out = os.path.normpath(path) else: - return os.path.normpath('/' + path) + out = os.path.normpath('/' + path) + if sys.platform == 'win32': + # on windows, normalize backslashes to sftp/posix format + out = out.replace('\\', '/') + return out def readlink(self, path): """ diff --git a/tests/test_sftp.py b/tests/test_sftp.py index 34690aba..6172a0dc 100755 --- a/tests/test_sftp.py +++ b/tests/test_sftp.py @@ -289,7 +289,11 @@ class SFTPTest (unittest.TestCase): stat = sftp.stat(FOLDER + '/special') sftp.chmod(FOLDER + '/special', (stat.st_mode & ~0777) | 0600) stat = sftp.stat(FOLDER + '/special') - self.assertEqual(stat.st_mode & 0777, 0600) + expected_mode = 0600 + if sys.platform == 'win32': + # chmod not really functional on windows + expected_mode = 0666 + self.assertEqual(stat.st_mode & 0777, expected_mode) self.assertEqual(stat.st_size, 1024) mtime = stat.st_mtime - 3600 @@ -321,7 +325,12 @@ class SFTPTest (unittest.TestCase): stat = f.stat() f.chmod((stat.st_mode & ~0777) | 0600) stat = f.stat() - self.assertEqual(stat.st_mode & 0777, 0600) + + expected_mode = 0600 + if sys.platform == 'win32': + # chmod not really functional on windows + expected_mode = 0666 + self.assertEqual(stat.st_mode & 0777, expected_mode) self.assertEqual(stat.st_size, 1024) mtime = stat.st_mtime - 3600 @@ -394,6 +403,10 @@ class SFTPTest (unittest.TestCase): """ create a symlink and then check that lstat doesn't follow it. """ + if not hasattr(os, "symlink"): + # skip symlink tests on windows + return + f = sftp.open(FOLDER + '/original.txt', 'w') try: f.write('original\n') @@ -535,7 +548,7 @@ class SFTPTest (unittest.TestCase): localname = os.tempnam() text = 'All I wanted was a plastic bunny rabbit.\n' - f = open(localname, 'w') + f = open(localname, 'wb') f.write(text) f.close() sftp.put(localname, FOLDER + '/bunny.txt') @@ -548,7 +561,7 @@ class SFTPTest (unittest.TestCase): localname = os.tempnam() sftp.get(FOLDER + '/bunny.txt', localname) - f = open(localname, 'r') + f = open(localname, 'rb') self.assertEquals(text, f.read(128)) f.close() @@ -574,6 +587,7 @@ class SFTPTest (unittest.TestCase): sum = f.check('md5', 0, 0, 510) self.assertEquals('EB3B45B8CD55A0707D99B177544A319F373183D241432BB2157AB9E46358C4AC90370B5CADE5D90336FC1716F90B36D6', paramiko.util.hexify(sum)) + f.close() finally: sftp.unlink(FOLDER + '/kitty.txt') |