diff options
| author | R David Murray <rdmurray@bitdance.com> | 2014-01-18 20:02:00 (GMT) |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2014-01-18 20:02:00 (GMT) |
| commit | bbf18bee3ca217e5eeb57470325d7c75f5e3457a (patch) | |
| tree | 35ed0db07ef1722558b58b8a90c208a8660c1d29 /Lib/uuid.py | |
| parent | 5d83d1a8141fa248356e4825857f166e4e65ec16 (diff) | |
| parent | 42953535686f7a8ed4dc250d9c87187c20462c1f (diff) | |
| download | cpython-bbf18bee3ca217e5eeb57470325d7c75f5e3457a.zip cpython-bbf18bee3ca217e5eeb57470325d7c75f5e3457a.tar.gz cpython-bbf18bee3ca217e5eeb57470325d7c75f5e3457a.tar.bz2 | |
Merge #19855: restore use of LC_ALL, not LC_MESSAGES
Diffstat (limited to 'Lib/uuid.py')
| -rw-r--r-- | Lib/uuid.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Lib/uuid.py b/Lib/uuid.py index 694a8a9..a4e5532 100644 --- a/Lib/uuid.py +++ b/Lib/uuid.py @@ -321,9 +321,10 @@ def _find_mac(command, args, hw_identifiers, get_index): return None try: - # LC_MESSAGES to get 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() |