commit cfa826c9845122d445dce4f51f556381865dbed3
author maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Mar 25 00:47:57 2011 +0000
committer maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Mar 25 00:47:57 2011 +0000
tree b8511b36377484b9fbc732bef901dbb084e5cd77
parent 3e331bdf1636e333f14a6c91b4535ccbcf9ee77b

Catch exception thrown on certain locale setup

Mostly happening on Mac. Will investigate later.

TBR=dpranke
BUG=
TEST=

Review URL: http://codereview.chromium.org/6696094

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@79354 0039d316-1c4b-4281-b951-d872f2087c98

fix_encoding.py

diff --git a/fix_encoding.py b/fix_encoding.py
index 5bfb58e..ab41869 100644
--- a/fix_encoding.py
+++ b/fix_encoding.py
@@ -46,17 +46,23 @@
     if attr[0:3] != 'LC_':
       continue
     aref = getattr(locale, attr)
-    locale.setlocale(aref, '')
+    try:
+      locale.setlocale(aref, '')
+    except locale.Error:
+      continue
     try:
       lang = locale.getlocale(aref)[0]
     except (TypeError, ValueError):
-      lang = None
+      continue
     if lang:
       try:
         locale.setlocale(aref, (lang, 'UTF-8'))
       except locale.Error:
         os.environ[attr] = lang + '.UTF-8'
-  locale.setlocale(locale.LC_ALL, '')
+  try:
+    locale.setlocale(locale.LC_ALL, '')
+  except locale.Error:
+    pass
   return True