Fix an exception raised when trying to gclient sync on a Mac

fix_encoding.py

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Collection of functions and classes to fix various encoding problems on
 multiple platforms with python.
 """
 
 import codecs
 import locale
@@ skipping 31 matching lines @@
   # Module 'sys' has no 'setdefaultencoding' member
   # pylint: disable=E1101
   sys.setdefaultencoding('utf-8')
   for attr in dir(locale):
     if attr[0:3] != 'LC_':
       continue
     aref = getattr(locale, attr)
     locale.setlocale(aref, '')
     try:
       lang = locale.getlocale(aref)[0]
-    except TypeError:
+    except (TypeError, ValueError):
       lang = None
     if lang:
       try:
         locale.setlocale(aref, (lang, 'UTF-8'))
       except locale.Error:
         os.environ[attr] = lang + '.UTF-8'
   locale.setlocale(locale.LC_ALL, '')
   return True
 
 
@@ skipping 284 matching lines @@
   if sys.platform == 'win32':
     ret &= fix_win_codec()
 
   ret &= fix_default_encoding()
 
   if sys.platform == 'win32':
     encoding = sys.getdefaultencoding()
     ret &= fix_win_sys_argv(encoding)
     ret &= fix_win_console(encoding)
   return ret