Skip to content

[3.6] bpo-29768: Fixed compile-time check for expat version. #576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 19 commits into from
Mar 9, 2017
Merged

[3.6] bpo-29768: Fixed compile-time check for expat version. #576

Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
4dbd02c
bpo-29532: Altering a kwarg dictionary passed to functools.partial() …
serhiy-storchaka Feb 20, 2017
63de4ae
Merge branch '3.6' of https://github.com/python/cpython into 3.6
serhiy-storchaka Feb 21, 2017
8d0b396
Merge branch '3.6' of https://github.com/python/cpython into 3.6
serhiy-storchaka Feb 21, 2017
227d289
Merge branch '3.6' of https://github.com/python/cpython into 3.6
serhiy-storchaka Feb 24, 2017
56fc6a3
Merge branch '3.6' of https://github.com/python/cpython into 3.6
serhiy-storchaka Feb 28, 2017
a1253ef
Merge remote-tracking branch 'upstream/3.6' into 3.6
serhiy-storchaka Mar 1, 2017
b785efc
Merge branch '3.6' of https://github.com/python/cpython into 3.6
serhiy-storchaka Mar 2, 2017
ca8b6f7
Merge branch '3.6' of https://github.com/python/cpython into 3.6
serhiy-storchaka Mar 3, 2017
4b6e44d
Merge remote-tracking branch 'upstream/3.6' into 3.6
serhiy-storchaka Mar 4, 2017
fffab40
Merge remote-tracking branch 'upstream/3.6' into 3.6
serhiy-storchaka Mar 5, 2017
6073a16
Merge remote-tracking branch 'upstream/3.6' into 3.6
serhiy-storchaka Mar 5, 2017
d80cc35
Merge remote-tracking branch 'upstream/3.6' into 3.6
serhiy-storchaka Mar 6, 2017
90c56c7
Merge remote-tracking branch 'upstream/3.6' into 3.6
serhiy-storchaka Mar 8, 2017
d81e614
bpo-28230: Document the pathlib support in tarfile and add tests. (#512)
serhiy-storchaka Mar 8, 2017
adc0a8a
Merge remote-tracking branch 'upstream/3.6' into 3.6
serhiy-storchaka Mar 8, 2017
157d3d9
bpo-28231: The zipfile module now accepts path-like objects for exter…
serhiy-storchaka Mar 8, 2017
db1982f
Update NEWS
serhiy-storchaka Mar 8, 2017
a0ad1a6
Merge remote-tracking branch 'upstream/3.6' into 3.6
serhiy-storchaka Mar 9, 2017
c3d232b
bpo-29768: Fixed compile-time check for expat version. (#574)
serhiy-storchaka Mar 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Modules/pyexpat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1191,7 +1191,7 @@ newxmlparseobject(const char *encoding, const char *namespace_separator, PyObjec
Py_DECREF(self);
return NULL;
}
#if ((XML_MAJOR_VERSION >= 2) && (XML_MINOR_VERSION >= 1)) || defined(XML_HAS_SET_HASH_SALT)
#if XML_COMBINED_VERSION >= 20100 || defined(XML_HAS_SET_HASH_SALT)
/* This feature was added upstream in libexpat 2.1.0. Our expat copy
* has a backport of this feature where we also define XML_HAS_SET_HASH_SALT
* to indicate that we can still use it. */
Expand Down