From ad30682ccefd7bc6faa0d2e3bb04d2c22bf54050 Mon Sep 17 00:00:00 2001 From: Josh Schneier Date: Sat, 25 Aug 2018 23:04:08 -0400 Subject: [PATCH] SFTPStorage: remove _pathmod indirection --- storages/backends/sftpstorage.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/storages/backends/sftpstorage.py b/storages/backends/sftpstorage.py index 6d00e1739..3f7079a66 100644 --- a/storages/backends/sftpstorage.py +++ b/storages/backends/sftpstorage.py @@ -46,9 +46,6 @@ def __init__(self, host=None, params=None, interactive=None, file_mode=None, if root_path is None else root_path self._base_url = setting('MEDIA_URL') if base_url is None else base_url - # for now it's all posix paths. Maybe someday we'll support figuring - # out if the remote host is windows. - self._pathmod = posixpath self._sftp = None def _connect(self): @@ -90,12 +87,8 @@ def sftp(self): self._connect() return self._sftp - def _join(self, *args): - # Use the path module for the remote host type to join a path together - return self._pathmod.join(*args) - def _remote_path(self, name): - return self._join(self._root_path, name) + return posixpath.join(self._root_path, name) def _open(self, name, mode='rb'): return SFTPStorageFile(name, self, mode) @@ -117,7 +110,7 @@ def _chown(self, path, uid=None, gid=None): def _mkdir(self, path): """Create directory, recursing up to create parent dirs if necessary.""" - parent = self._pathmod.dirname(path) + parent = posixpath.dirname(path) if not self.exists(parent): self._mkdir(parent) self.sftp.mkdir(path) @@ -132,7 +125,7 @@ def _save(self, name, content): """Save file via SFTP.""" content.open() path = self._remote_path(name) - dirname = self._pathmod.dirname(path) + dirname = posixpath.dirname(path) if not self.exists(dirname): self._mkdir(dirname)