From: R David Murray <rdmurray@bitdance.com>
Date: Sat, 18 Jan 2014 20:02:00 +0000 (-0500)
Subject: Merge #19855: restore use of LC_ALL, not LC_MESSAGES
X-Git-Tag: v3.4.0b3~102
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bbf18bee3ca217e5eeb57470325d7c75f5e3457a;p=python

Merge #19855: restore use of LC_ALL, not LC_MESSAGES
---

bbf18bee3ca217e5eeb57470325d7c75f5e3457a
diff --cc Lib/uuid.py
index 694a8a9772,9946042c29..a4e553247d
--- a/Lib/uuid.py
+++ b/Lib/uuid.py
@@@ -321,9 -321,9 +321,10 @@@ def _find_mac(command, args, hw_identif
              return None
  
      try:
-         # LC_MESSAGES to get English output, 2>/dev/null to
 -        # LC_ALL to ensure English output, 2>/dev/null to
--        # prevent output on stderr
-         cmd = 'LC_MESSAGES=C %s %s 2>/dev/null' % (executable, args)
++        # LC_ALL to ensure English output, 2>/dev/null to prevent output on
++        # stderr (Note: we don't have an example where the words we search for
++        # are actually localized, but in theory some system could do so.)
+         cmd = 'LC_ALL=C %s %s 2>/dev/null' % (executable, args)
          with os.popen(cmd) as pipe:
              for line in pipe:
                  words = line.lower().split()