From f5fddfbb9a7ff3f6e6b45344408c036dde25c73a Mon Sep 17 00:00:00 2001 From: Ben Date: Wed, 15 Nov 2017 19:08:32 +0100 Subject: [PATCH 1/2] default argument of prop as deep default --- easywebdav/client.py | 2 +- tests/tests.py | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/easywebdav/client.py b/easywebdav/client.py index 4003198..0691584 100644 --- a/easywebdav/client.py +++ b/easywebdav/client.py @@ -31,7 +31,7 @@ def codestr(code): def prop(elem, name, default=None): child = elem.find('.//{DAV:}' + name) - return default if child is None else child.text + return default if child is None or child.text is None else child.text def elem2file(elem): diff --git a/tests/tests.py b/tests/tests.py index 173f9a6..d8d9eb1 100644 --- a/tests/tests.py +++ b/tests/tests.py @@ -151,3 +151,13 @@ def test__upload_stream(self): sio.seek(0) self.client.upload(sio, 'file') self._assert_file('file', self.content) + + def test__ls(self): + self._create_dir('one', 'two') + path = self._local_file(self.content) + self.client.upload(path, 'file') + list = self.client.ls() + self.assertSetEqual(set(map( + lambda x : x.replace('http://localhost:28080/', ''), + {entry.name for entry in list})), + {'.', 'one', 'two', 'file'}) From fc09e2d16606a797afff44a784c2db3dfc1c6b3f Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 13 Jul 2018 14:00:22 +0200 Subject: [PATCH 2/2] update to python3 --- easywebdav/client.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/easywebdav/client.py b/easywebdav/client.py index 0691584..9c2a689 100644 --- a/easywebdav/client.py +++ b/easywebdav/client.py @@ -150,7 +150,7 @@ def delete(self, path): self._send('DELETE', path, 204) def upload(self, local_path_or_fileobj, remote_path): - if isinstance(local_path_or_fileobj, basestring): + if isinstance(local_path_or_fileobj, str): with open(local_path_or_fileobj, 'rb') as f: self._upload(f, remote_path) else: @@ -161,7 +161,7 @@ def _upload(self, fileobj, remote_path): def download(self, remote_path, local_path_or_fileobj): response = self._send('GET', remote_path, 200, stream=True) - if isinstance(local_path_or_fileobj, basestring): + if isinstance(local_path_or_fileobj, str): with open(local_path_or_fileobj, 'wb') as f: self._download(f, response) else: