Merge lp:~jameinel/bzr/2.3-unicode-home into lp:bzr

[John A Meinel]

Decode config_dir() environment variables on Windows using 'mbcs'

This changes config_dir() to handle non-ascii environment variables. 'mbcs' seems the sanest way to do it on Windows. It gets the bzrlib.tests.blackbox.test_version...test_unicode_bzr_home to pass on Windows.

This is the most sane small change that I can come up with, and I'm pretty ok with it.

[Vincent Ladeuil (vila)]

Put the same comment above both .decode() and land !

review: Needs Fixing

[Martin Packman (gz)]

This is basically the right thing and covers every reasonable use of bzr without having to resort to recreating chunks of Python 3. None of the 'mbcs' codec pitfalls apply here as the value we're reading has already been mangled to fit in the locale encoding.

review: Approve

[John A Meinel (jameinel)]

sent to pqm by email

=== modified file 'bzrlib/config.py'
--- bzrlib/config.py	2010-11-29 01:23:53 +0000
+++ bzrlib/config.py	2011-01-12 18:16:32 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2010 Canonical Ltd
+# Copyright (C) 2005-2011 Canonical Ltd
 #   Authors: Robert Collins <[e-mail]>
 #            and others
 #
@@ -1131,10 +1131,16 @@
     """
     base = os.environ.get('BZR_HOME', None)
     if sys.platform == 'win32':
+        # environ variables on Windows are in user encoding/mbcs. So decode
+        # before using one
+        if base is not None:
+            base = base.decode('mbcs')
         if base is None:
             base = win32utils.get_appdata_location_unicode()
         if base is None:
             base = os.environ.get('HOME', None)
+            if base is not None:
+                base = base.decode('mbcs')
         if base is None:
             raise errors.BzrError('You must have one of BZR_HOME, APPDATA,'
                                   ' or HOME set')