[Python-Dev] [Python-checkins] cpython (2.7): Fixes Issue 14234: fix for the previous commit, keep compilation when (original) (raw)

Jim Jewett jimjjewett at gmail.com
Mon Mar 19 22:01:19 CET 2012

Does this mean that if Python is updated before expat, python will compile out the expat randomization, and therefore not use if even after expat is updated?

-jJ

On Thu, Mar 15, 2012 at 2:01 PM, benjamin.peterson <python-checkins at python.org> wrote:

http://hg.python.org/cpython/rev/ada6bfbeceb8 changeset:   75699:ada6bfbeceb8 branch:      2.7 user:        Gregory P. Smith <greg at krypto.org> date:        Wed Mar 14 18:12:23 2012 -0700 summary:  Fixes Issue 14234: fix for the previous commit, keep compilation when using --with-system-expat working when the system expat does not have salted hash support.

files:  Modules/expat/expat.h |  2 ++  Modules/pyexpat.c     |  5 +++++  2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/Modules/expat/expat.h b/Modules/expat/expat.h --- a/Modules/expat/expat.h +++ b/Modules/expat/expat.h @@ -892,6 +892,8 @@  XMLSetHashSalt(XMLParser parser, unsigned long hashsalt); +#define XMLHASSETHASHSALT  /* Python Only: Defined for pyexpat.c. */ +  /* If XMLParse or XMLParseBuffer have returned XMLSTATUSERROR, then  XMLGetErrorCode returns information about the error.  */ diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c --- a/Modules/pyexpat.c +++ b/Modules/pyexpat.c @@ -1302,8 +1302,13 @@ else { self->itself = XMLParserCreate(encoding); } +#if ((XMLMAJORVERSION >= 2) && (XMLMINORVERSION >= 1)) || defined(XMLHASSETHASHSALT) +    /* This feature was added upstream in libexpat 2.1.0.  Our expat copy +     * has a backport of this feature where we also define XMLHASSETHASHSALT +     * to indicate that we can still use it. */ XMLSetHashSalt(self->itself, (unsigned long)PyHashSecret.prefix); +#endif self->intern = intern; PyXINCREF(self->intern);  #ifdef PyTPFLAGSHAVEGC -- Repository URL: http://hg.python.org/cpython

Python-checkins mailing list Python-checkins at python.org http://mail.python.org/mailman/listinfo/python-checkins

More information about the Python-Dev mailing list