urlencode collection names

Author: untitaker

vdirsyncer/storage/remotestorage.py

@@ -30,6 +30,7 @@
 logger = log.get(__name__)
 
 urljoin = utils.compat.urlparse.urljoin
+urlquote = utils.compat.urlquote
 
 
 def _ensure_slash(dir):
@@ -61,18 +62,20 @@ def __init__(self, account, scope, verify=True, verify_fingerprint=None,
         self._settings.update(prepare_verify(verify, verify_fingerprint))
 
         self.scope = scope + ':rw'
-        if collection:
-            scope = urljoin(_ensure_slash(scope),
-                            _ensure_slash(collection))
-
         self._session = OAuth2Session(
             CLIENT_ID, client=MobileApplicationClient(CLIENT_ID),
             scope=self.scope,
             redirect_uri=('data:text/html,<script>'
                           'document.write(location.hash);</script>'),
             token={'access_token': access_token},
         )
-        self._discover_endpoints(scope)
+
+        subpath = scope
+        if collection:
+            subpath = urljoin(_ensure_slash(scope),
+                              _ensure_slash(urlquote(collection)))
+
+        self._discover_endpoints(subpath)
 
         if not access_token:
             self._get_access_token()