From e9db19a3526307cdffe362569ee864033ae2dea6 Mon Sep 17 00:00:00 2001 From: Jens Luetjen Date: Fri, 1 Apr 2016 19:39:48 +0200 Subject: [PATCH] Handle all path- and file-names as bytestings --- mopidy/core/actor.py | 4 ++-- mopidy/internal/storage.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mopidy/core/actor.py b/mopidy/core/actor.py index de6c64d0..32b5f47f 100644 --- a/mopidy/core/actor.py +++ b/mopidy/core/actor.py @@ -174,7 +174,7 @@ class Core( Save current state to disk. """ - file_name = os.path.join(self._get_data_dir(), b'state.json.gz') + file_name = bytes(os.path.join(self._get_data_dir(), b'state.json.gz')) logger.info('Save state to %s', file_name) data = {} @@ -206,7 +206,7 @@ class Core( :type coverage: list of string (see above) """ - file_name = os.path.join(self._get_data_dir(), b'state.json.gz') + file_name = bytes(os.path.join(self._get_data_dir(), b'state.json.gz')) logger.info('Load state from %s', file_name) data = storage.load(file_name) diff --git a/mopidy/internal/storage.py b/mopidy/internal/storage.py index 660b22ae..3b7106a0 100644 --- a/mopidy/internal/storage.py +++ b/mopidy/internal/storage.py @@ -17,7 +17,7 @@ def load(path): Deserialize data from file. :param path: full path to import file - :type path: str + :type path: bytes :return: deserialized data :rtype: dict """ @@ -40,7 +40,7 @@ def dump(path, data): Serialize data to file. :param path: full path to export file - :type path: str + :type path: bytes :param data: dictionary containing data to save :type data: dict """