Resolving upstream conflict.

2 files changed, 5 insertions, 5 deletions

diff --git a/admin/lib/csvstore.py b/admin/lib/csvstore.py
index c4c882c..58a3056 100644
--- a/admin/lib/csvstore.py
+++ b/admin/lib/csvstore.py
@@ -1,20 +1,20 @@
-import StringIO
 from UserDict import IterableUserDict
+from StringIO import StringIO
 
 import csv
 
 class Storage(IterableUserDict):
-    def __init__(self, file):
+    def __init__(self, encapsulation):
         self.encapsulation = encapsulation
         self.encapsulation.begin_transaction()
         try:
             stored = {x[0]: [x[1], x[2]] 
-                for x in csv.reader([self.encapsulation.data])}
+                for x in csv.reader(StringIO(self.encapsulation.data))}
         except IOError:
             stored = {}
         IterableUserDict.__init__(self, stored)
     def sync(self):
-        f = StringIO.StringIO()
+        f = StringIO()
         csv.writer(f).writerows(
             [c, u, name] for c, (u, name) in self.data.iteritems())
         
diff --git a/admin/lib/storage.py b/admin/lib/storage.py
index 5627ff7..1d5b992 100644
--- a/admin/lib/storage.py
+++ b/admin/lib/storage.py
@@ -5,7 +5,7 @@ import jsonstore
 import options
 import storage_encapsulation
 
-if options.storage_encrypt == True
+if options.storage_encrypt == True:
     encapsulation_class = storage_encapsulation.DESFileEncapsulation
 else:
     encapsulation_class = storage_encapsulation.RawFileEncapsulation