~facundo/magicicada-client/full-closed-venv

« back to all changes in this revision

Viewing changes to ubuntuone/syncdaemon/config.py

[r=facundo] - Provide docker rules to be able to build a xenial image and run tests in it.
- Fix failing test for config file parsing for when LANG=C.

Show diffs side-by-side

added added

removed removed

Lines of Context:
206
206
    config_files = []
207
207
    for xdg_config_dir in load_config_paths('ubuntuone'):
208
208
        xdg_config_dir = unicode_path(xdg_config_dir)
209
 
        config_file = os.path.join(xdg_config_dir, CONFIG_FILE)
 
209
        config_file = os.path.join(xdg_config_dir, CONFIG_FILE).encode('utf8')
210
210
        if os.path.exists(config_file):
211
211
            config_files.append(config_file)
212
212
 
213
 
        config_logs = os.path.join(xdg_config_dir, CONFIG_LOGS)
 
213
        config_logs = os.path.join(xdg_config_dir, CONFIG_LOGS).encode('utf8')
214
214
        if os.path.exists(config_logs):
215
215
            config_files.append(config_logs)
216
216