summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2014-01-18 19:56:10 (GMT)
committerR David Murray <rdmurray@bitdance.com>2014-01-18 19:56:10 (GMT)
commit42953535686f7a8ed4dc250d9c87187c20462c1f (patch)
treebab0b8599d13be1b257ee3e04914ee29d480a430
parentff97b08d0022392da23a25aa5ccb04e6a2966e8b (diff)
downloadcpython-42953535686f7a8ed4dc250d9c87187c20462c1f.zip
cpython-42953535686f7a8ed4dc250d9c87187c20462c1f.tar.gz
cpython-42953535686f7a8ed4dc250d9c87187c20462c1f.tar.bz2
#19855: restore use of LC_ALL, not LC_MESSAGES
I didn't realize LC_ALL was an override, and I should have. I tried to make a test, but it is not clear that the LC variables actually affect the strings that uuid is using to parse the command output.
-rw-r--r--Lib/uuid.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/uuid.py b/Lib/uuid.py
index 7705a8a..9946042 100644
--- a/Lib/uuid.py
+++ b/Lib/uuid.py
@@ -321,9 +321,9 @@ def _find_mac(command, args, hw_identifiers, get_index):
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)
+ 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()