From: Jesus Cea <jcea@jcea.es>
Date: Thu, 4 Oct 2012 11:58:22 +0000 (+0200)
Subject: MERGE: Closes #16112: platform.architecture does not correctly escape argument to... 
X-Git-Tag: v3.4.0a1~2385
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=677ffd16bf8ec440a22b65042293654c6a76095f;p=thirdparty%2FPython%2Fcpython.git

MERGE: Closes #16112: platform.architecture does not correctly escape argument to /usr/bin/file
---

677ffd16bf8ec440a22b65042293654c6a76095f
diff --cc Misc/NEWS
index 042b3ccb77c7,4051d2b1554d..d856642bfc04
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -65,6 -58,6 +65,9 @@@ Librar
  - Issue #15421: Fix an OverflowError in `Calendar.itermonthdates()` after
    `datetime.MAXYEAR`.  Patch by Cédric Krier.
  
++- Issue #16112: platform.architecture does not correctly escape argument to
++  /usr/bin/file.  Patch by David Benjamin.
++
  - Issue #15970: `xml.etree.ElementTree` now serializes correctly the empty HTML
    elements 'meta' and 'param'.