Filesystem paths should be byte arrays, not unicode sequences. (dlo trac #7733)

Passing a unicode string to os.path.join(x,y) and other functions will attempt
to convert all sides of the path to unicode using the ASCII encoding.  This
will prohibit the use of non-ASCII characters in filenames, which is not
what we want!  We need all paths passed around internally to be 'str' objects,
not 'unicode' objects.  Unfortunately, dbus' STRING type enforces UTF-8
encoding.  So, we compromise: we use 's' in our dbus signature, but we pass the
'utf8_strings=True' keyword option when we declare our methods, so that
the parameters are given to use as 'str' not 'unicode'.

These functions will not support filenames which are not UTF-8 encoded.

1 files changed, 4 insertions, 2 deletions

diff --git a/service/activityregistryservice.py b/service/activityregistryservice.py
index 6ba5598..c8a8efa 100644
--- a/service/activityregistryservice.py
+++ b/service/activityregistryservice.py
@@ -37,7 +37,8 @@ class ActivityRegistry(dbus.service.Object):
         bundle_registry.connect('bundle-changed', self._bundle_changed_cb)
 
     @dbus.service.method(_ACTIVITY_REGISTRY_IFACE,
-                         in_signature='s', out_signature='b')
+                         in_signature='s', out_signature='b',
+                         utf8_strings=True)
     def AddBundle(self, bundle_path):
         '''Register the activity bundle with the global registry 
         
@@ -52,7 +53,8 @@ class ActivityRegistry(dbus.service.Object):
         return registry.add_bundle(bundle_path)
 
     @dbus.service.method(_ACTIVITY_REGISTRY_IFACE,
-                         in_signature='s', out_signature='b')
+                         in_signature='s', out_signature='b',
+                         utf8_strings=True)
     def RemoveBundle(self, bundle_path):
         '''Unregister the activity bundle with the global registry