From 03f16810eebf914ce506031551c8eef84d90ffe6 Mon Sep 17 00:00:00 2001
From: Pavel Zuna <pzuna@redhat.com>
Date: Thu, 11 Feb 2010 15:05:13 +0100
Subject: Use unicode instead of str for environmental variables in Env.

---
 ipalib/config.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'ipalib/config.py')

diff --git a/ipalib/config.py b/ipalib/config.py
index 5311f9904..8597645a4 100644
--- a/ipalib/config.py
+++ b/ipalib/config.py
@@ -243,7 +243,9 @@ class Env(object):
             )
         assert not hasattr(self, key)
         if isinstance(value, basestring):
-            value = str(value.strip())
+            value = value.strip()
+            if isinstance(value, str):
+                value = value.decode('utf-8')
             m = {
                 'True': True,
                 'False': False,
@@ -259,7 +261,7 @@ class Env(object):
                     value = float(value)
                 except (TypeError, ValueError):
                     pass
-        assert type(value) in (str, int, float, bool, NoneType)
+        assert type(value) in (unicode, int, float, bool, NoneType)
         object.__setattr__(self, key, value)
         self.__d[key] = value
 
-- 
cgit