Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/datastore

1 files changed, 9 insertions, 2 deletions

diff --git a/src/olpc/datastore/datastore.py b/src/olpc/datastore/datastore.py
index 10a51fd..b4fe356 100644
--- a/src/olpc/datastore/datastore.py
+++ b/src/olpc/datastore/datastore.py
@@ -68,8 +68,15 @@ class DataStore(dbus.service.Object):
         # medium (maybe an SD card for example) and we'd want to keep
         # that on the XO itself. In these cases their might be very
         # little identifying information on the media itself.
-        if not options: options = {}
-        mp = self.connect_backingstore(uri, **options)
+
+        uri = str(uri)
+
+        _options = {}
+        if options:
+            for key, value in options.iteritems():
+                _options[str(key)] = str(value)
+
+        mp = self.connect_backingstore(uri, **_options)
         if not mp: return ''
         if mp.id in self.mountpoints:
             self.mountpoints[mp.id].stop()