Merge branch 'master' into dev/add-cache

Author: zopyx

setup.py

@@ -25,8 +25,10 @@
 REQUIREMENTS = [
     "fs>2.0",
     "webdavclient2",
-    "python-dateutil",
     "cachetools"
+    "webdavclient3",
+    "python-dateutil"
+
 ]
 
 setup(

webdavfs/opener.py

@@ -19,10 +19,15 @@ def open_fs(self, fs_url, parse_result, writeable, create, cwd):
         webdav_host, _, webdav_port = webdav_host.partition(':')
         if parse_result.protocol == 'webdav':
             webdav_scheme = 'http'
-            webdav_port = 80
+            default_webdav_port = 80
         else:
             webdav_scheme = 'https'
-            webdav_port = 443
+            default_webdav_port = 443
+
+        if webdav_port == "":
+            webdav_port = default_webdav_port
+        else:
+            webdav_port = int(webdav_port)
 
         return WebDAVFS(
             url='{}://{}:{}'.format(webdav_scheme, webdav_host, webdav_port),

webdavfs/webdavfs.py

@@ -9,9 +9,9 @@
 import operator
 import logging
 
-import webdav2.client as wc
-import webdav2.exceptions as we
-import webdav2.urn as wu
+import webdav3.client as wc
+import webdav3.exceptions as we
+import webdav3.urn as wu
 
 from fs import errors
 from fs.base import FS
@@ -250,6 +250,9 @@ def getinfo(self, path, namespaces=None):
         else:
             try:
                 info = self.client.info(_path.encode('utf-8'))
+                # displayname is optional
+                if info['name'] is None:
+                    info['name'] = _path.split("/")[-1]
                 info_dict = self._create_info_dict(info)
                 if self.client.is_dir(_path.encode('utf-8')):
                     info_dict['basic']['is_dir'] = True