Remember order of items

vdirsyncer/storage/singlefile.py

@@ -8,6 +8,7 @@
 '''
 
 import os
+import collections
 
 from .base import Item, Storage
 import vdirsyncer.exceptions as exceptions
@@ -59,8 +60,7 @@ class SingleFileStorage(Storage):
         self.wrapper = wrapper
 
     def list(self):
-        self._items = {}
-        text = None
+        self._items = collections.OrderedDict()
 
         try:
             with open(self.path, self._read_mode) as f:

vdirsyncer/utils/vobject.py

@@ -39,7 +39,6 @@ def split_collection(text, inline=(u'VTIMEZONE',),
 
             lines.extend(to_unicode_lines(item))
             lines.append(end)
-            lines.append(u'')
 
             yield u''.join(line + u'\r\n' for line in lines if line)