Abstract listing compat hacks

Author: untitaker

vdirsyncer/storage/remotestorage.py

@@ -20,6 +20,15 @@
 def _ensure_slash(dir):
     return dir.rstrip('/') + '/'
 
+def _iter_listing(json):
+    new_listing = '@context' in json # draft-02 and beyond
+    if new_listing:
+        json = json['items']
+    for name, info in utils.compat.iteritems(json):
+        if not new_listing:
+            info = {'ETag': info}
+        yield name, info
+
 
 class Session(object):
     def __init__(self, account, fileext, verify=True, verify_fingerprint=None,
@@ -140,7 +149,7 @@ def discover(cls, **base_args):
         except exceptions.NotFoundError:
             return
 
-        for name, info in utils.compat.iteritems(r.json()['items']):
+        for name, info in _iter_listing(r.json()):
             if not name.endswith('/'):
                 continue  # not a folder
 
@@ -162,20 +171,11 @@ def list(self):
         except exceptions.NotFoundError:
             return
 
-        j = r.json()
-        new_listing = '@context' in j  # draft-02 and beyond
-        if new_listing:
-            j = j['items']
-
-        for name, info in utils.compat.iteritems(j):
-            if new_listing:
-                etag = info['ETag']
-            else:
-                etag = info
-
+        for name, info in _iter_listing(r.json()):
             if not name.endswith(self.fileext):
                 continue
 
+            etag = info['ETag']
             etag = '"' + etag + '"'
             yield name, etag