Work around massive string type inconsistency

See #315
This commit is contained in:
Markus Unterwaditzer 2016-01-10 04:51:36 +01:00
parent 2957a0dc41
commit 7646222bc7

View file

@ -5,7 +5,7 @@ import functools
from .. import exceptions, sync
from ..utils import uniq
from ..utils.compat import with_metaclass
from ..utils.compat import to_native, with_metaclass
from ..utils.vobject import Item # noqa
@ -77,8 +77,9 @@ class Storage(with_metaclass(StorageMeta)):
self.read_only = bool(read_only)
if collection and instance_name:
assert isinstance(collection, str)
instance_name = '{}/{}'.format(instance_name, collection)
# XXX: PY2 hack
instance_name = '{}/{}'.format(instance_name,
to_native(collection, 'utf-8'))
self.instance_name = instance_name
self.collection = collection