1 files changed, 21 insertions, 7 deletions
diff --git a/libbe/config.py b/libbe/config.py
index 79c0d6f..94c700e 100644
--- a/libbe/config.py
+++ b/libbe/config.py
@@ -15,30 +15,40 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 import ConfigParser
+import codecs
+import locale
 import os.path
+import sys
 import doctest
 
+default_encoding = sys.getfilesystemencoding() or locale.getpreferredencoding()
+
 def path():
     """Return the path to the per-user config file"""
     return os.path.expanduser("~/.bugs_everywhere")
 
-def set_val(name, value, section="DEFAULT"):
+def set_val(name, value, section="DEFAULT", encoding=None):
     """Set a value in the per-user config file
 
     :param name: The name of the value to set
     :param value: The new value to set (or None to delete the value)
     :param section: The section to store the name/value in
     """
+    if encoding == None:
+        encoding = default_encoding
     config = ConfigParser.ConfigParser()
-    config.read(path())
+    f = codecs.open(path(), "r", encoding)
+    config.readfp(f, path())
+    f.close()
     if value is not None:
         config.set(section, name, value)
     else:
         config.remove_option(section, name)
-    config.write(file(path(), "wb"))
-    pass
+    f = codecs.open(path(), "w", encoding)
+    config.write(f)
+    f.close()
 
-def get_val(name, section="DEFAULT"):
+def get_val(name, section="DEFAULT", encoding=None):
     """
     Get a value from the per-user config file
 
@@ -49,13 +59,17 @@ def get_val(name, section="DEFAULT"):
     True
     >>> set_val("junk", "random")
     >>> get_val("junk")
-    'random'
+    u'random'
     >>> set_val("junk", None)
     >>> get_val("junk") is None
     True
     """
+    if encoding == None:
+        encoding = default_encoding
     config = ConfigParser.ConfigParser()
-    config.read(path())
+    f = codecs.open(path(), "r", encoding)
+    config.readfp(f, path())
+    f.close()
     try:
         return config.get(section, name)
     except ConfigParser.NoOptionError: