Skip to content

Directory methods fixes #7

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Directory methods fixes #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d60975b
Do not raise error if resourcetype is not specified
blootsvoets Jun 9, 2016
872b32d
check() to match directory without trailing slash
blootsvoets Jun 9, 2016
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
13 changes: 3 additions & 10 deletions webdav/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,12 +278,8 @@ def parse(response, path):
href = resp.findtext("{DAV:}href")
urn = unquote(href)

if path.endswith(Urn.separate):
if path == urn or path[:-1] == urn:
return True
else:
if path == urn:
return True
if path.rstrip(Urn.separate) == urn.rstrip(Urn.separate):
return True

return False

Expand Down Expand Up @@ -843,10 +839,7 @@ def parse(response, path):
path_with_sep = "{path}{sep}".format(path=path, sep=Urn.separate)
if not path == urn and not path_with_sep == urn:
continue
type = resp.find(".//{DAV:}resourcetype")
if type is None:
raise MethodNotSupported(name="is_dir", server=self.webdav.hostname)
dir_type = type.find("{DAV:}collection")
dir_type = resp.find(".//{DAV:}resourcetype/{DAV:}collection")

return True if dir_type is not None else False

Expand Down