From 33bc01df7de21bc650d36d07f55c1446776bd897 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sat, 18 Dec 2010 16:07:05 +0100 Subject: [PATCH] [molecule*] beautify output, make molecule.settings contain only utf strings --- molecule/settings.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/molecule/settings.py b/molecule/settings.py index f99eccd..8d53085 100644 --- a/molecule/settings.py +++ b/molecule/settings.py @@ -17,7 +17,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. import os -from molecule.compat import get_stringtype +from molecule.compat import get_stringtype, convert_to_unicode from molecule.exception import SpecFileError from molecule.specs.skel import GenericSpec from molecule.version import VERSION @@ -73,6 +73,13 @@ class Configuration(dict): 'pkgs_remover': ["/usr/bin/equo", "remove"], 'pkgs_updater': ["/usr/bin/equo", "update"], } + # convert everything to unicode in one pass + for k, v in settings.items(): + if isinstance(v, get_stringtype()): + settings[k] = convert_to_unicode(v) + elif isinstance(v, (list, tuple)): + settings[k] = [convert_to_unicode(x) for x in v] + self.clear() self.update(settings) self.update(mysettings)