Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow passing arbitrary args to requests #25

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow passing arbitrary args to requests #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 20 additions & 18 deletions easywebdav/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,11 @@ def cd(self, path):
else:
self.cwd += stripped_path

def mkdir(self, path, safe=False):
def mkdir(self, path, safe=False, **kwargs):
expected_codes = 201 if not safe else (201, 301, 405)
self._send('MKCOL', path, expected_codes)
self._send('MKCOL', path, expected_codes, **kwargs)

def mkdirs(self, path):
def mkdirs(self, path, **kwargs):
dirs = [d for d in path.split('/') if d]
if not dirs:
return
Expand All @@ -132,7 +132,7 @@ def mkdirs(self, path):
try:
for dir in dirs:
try:
self.mkdir(dir, safe=True)
self.mkdir(dir, safe=True, **kwargs)
except Exception as e:
if e.actual_code == 409:
raise
Expand All @@ -141,26 +141,27 @@ def mkdirs(self, path):
finally:
self.cd(old_cwd)

def rmdir(self, path, safe=False):
def rmdir(self, path, safe=False, **kwargs):
path = str(path).rstrip('/') + '/'
expected_codes = 204 if not safe else (204, 404)
self._send('DELETE', path, expected_codes)
self._send('DELETE', path, expected_codes, **kwargs)

def delete(self, path):
self._send('DELETE', path, 204)
def delete(self, path, **kwargs):
self._send('DELETE', path, 204, **kwargs)

def upload(self, local_path_or_fileobj, remote_path):
def upload(self, local_path_or_fileobj, remote_path, **kwargs):
if isinstance(local_path_or_fileobj, basestring):
with open(local_path_or_fileobj, 'rb') as f:
self._upload(f, remote_path)
else:
self._upload(local_path_or_fileobj, remote_path)
self._upload(local_path_or_fileobj, remote_path, **kwargs)

def _upload(self, fileobj, remote_path):
self._send('PUT', remote_path, (200, 201, 204), data=fileobj)
def _upload(self, fileobj, remote_path, **kwargs):
self._send('PUT', remote_path, (200, 201, 204),
data=fileobj, **kwargs)

def download(self, remote_path, local_path_or_fileobj):
response = self._send('GET', remote_path, 200, stream=True)
def download(self, remote_path, local_path_or_fileobj, **kwargs):
response = self._send('GET', remote_path, 200, stream=True, **kwargs)
if isinstance(local_path_or_fileobj, basestring):
with open(local_path_or_fileobj, 'wb') as f:
self._download(f, response)
Expand All @@ -171,9 +172,10 @@ def _download(self, fileobj, response):
for chunk in response.iter_content(DOWNLOAD_CHUNK_SIZE_BYTES):
fileobj.write(chunk)

def ls(self, remote_path='.'):
def ls(self, remote_path='.', **kwargs):
headers = {'Depth': '1'}
response = self._send('PROPFIND', remote_path, (207, 301), headers=headers)
response = self._send('PROPFIND', remote_path, (207, 301),
headers=headers, **kwargs)

# Redirect
if response.status_code == 301:
Expand All @@ -183,6 +185,6 @@ def ls(self, remote_path='.'):
tree = xml.fromstring(response.content)
return [elem2file(elem) for elem in tree.findall('{DAV:}response')]

def exists(self, remote_path):
response = self._send('HEAD', remote_path, (200, 301, 404))
def exists(self, remote_path, **kwargs):
response = self._send('HEAD', remote_path, (200, 301, 404), **kwargs)
return True if response.status_code != 404 else False