python3 support

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "easywebdav"]
+	path = easywebdav
+	url = https://github.com/Kxrr/easywebdav

nutstore_cli/client/base.py

@@ -8,8 +8,9 @@
 from nutstore_cli.client.utils import check_local_path
 from nutstore_cli.client.path_helper import *
 
-import easywebdav
+from nutstore_cli import easywebdav
 
+from six.moves.urllib.parse import unquote
 
 class BaseNutStoreClient(object):
     """坚果云"""
@@ -49,6 +50,7 @@ def download(self, remote_path, local_path=None):
 
     def ls(self):
         def file_in_dir(filename, directory):
+            filename=unquote(filename)
             return (directory in filename) and (filename != directory)
 
         real_path = self.np.real

nutstore_cli/client/exceptions.py

@@ -1,5 +1,5 @@
 # coding: utf-8
-from easywebdav.client import WebdavException
+from nutstore_cli.easywebdav.client import WebdavException
 
 
 class NutStoreClientException(WebdavException):

nutstore_cli/client/path_helper.py

@@ -4,7 +4,8 @@
     basename,
     splitext,
 )
-from urlparse import urljoin
+
+from six.moves.urllib.parse import urljoin
 
 __all__ = (
     'join',

nutstore_cli/client/utils.py

@@ -3,10 +3,11 @@
 import os
 
 from nutstore_cli.client.exceptions import FileNotExistException
+from six import string_types
 
 
 def get_attr(obj, attr_or_fn):
-    if isinstance(attr_or_fn, basestring):
+    if isinstance(attr_or_fn, string_types):
         return getattr(obj, attr_or_fn)
     elif callable(attr_or_fn):
         return attr_or_fn(obj)
@@ -22,4 +23,4 @@ def deco(*args, **kwargs):
             raise FileNotExistException.make_exception(local_path)
         return func(*args, **kwargs)
 
-    return deco
+    return deco

nutstore_cli/config.py

@@ -28,7 +28,7 @@ def load(self, filename):
             return config
         debug('Loading config from {}'.format(filename))
         with open(filename) as f:
-            for line in f.xreadlines():
+            for line in f.readlines():
                 m = self.PARSE_RE.search(line)
                 if m and (m.group(1).strip() in CONFIG_KEYS):
                     k = m.group(1).strip()

nutstore_cli/easywebdav/__init__.py

@@ -0,0 +1 @@
+../../easywebdav/easywebdav/__init__.py

nutstore_cli/easywebdav/__version__.py

@@ -0,0 +1 @@
+../../easywebdav/easywebdav/__version__.py

nutstore_cli/easywebdav/client.py

@@ -0,0 +1 @@
+../../easywebdav/easywebdav/client.py

nutstore_cli/execution.py

@@ -1,7 +1,8 @@
 # encoding: utf-8
 import re
 from os import path
-from itertools import ifilter
+
+from six.moves import filter
 
 import click
 import tabulate
@@ -73,10 +74,10 @@ def visit_ls(self, node, children):
             LS_LABELS
         )
         grep_keywords = children[2].children[4].children[0].text if children[2].children else None
-        rows = ifilter(lambda row: bool(row[0]), rows)
+        rows = filter(lambda row: bool(row[0]), rows)
         if grep_keywords:
             echo.debug('Issue a grep "{}"'.format(grep_keywords))
-            rows = ifilter(lambda row: re.search(grep_keywords, row[0], flags=re.IGNORECASE), rows)
+            rows = filter(lambda row: re.search(grep_keywords, row[0], flags=re.IGNORECASE), rows)
         rows = list(rows)
         rows.sort(key=lambda row: row[2])  # order by mtime
         echo.echo(tabulate.tabulate(rows, headers=labels))