Skip to content

Commit eba0bad

Browse files
benjaminpbenjaminp
committed
Merge branch 'release-2.7.14' into 2.7
2 parents fef3ddb + c00d508 commit eba0bad

20 files changed

+584
-58
lines changed

‎Misc/NEWS.d/next/Library/2017-09-04-23-41-35.bpo-31170.QGmJ1t.rst

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
expat: Update libexpat from 2.2.3 to 2.2.4. Fix copying of partial
2+
characters for UTF-8 input (libexpat bug 115):
3+
https://github.com/libexpat/libexpat/issues/115

‎Modules/expat/ascii.h

+30-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,33 @@
1-
/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
2-
See the file COPYING for copying permission.
1+
/*
2+
__ __ _
3+
___\ \/ /_ __ __ _| |_
4+
/ _ \\ /| '_ \ / _` | __|
5+
| __// \| |_) | (_| | |_
6+
\___/_/\_\ .__/ \__,_|\__|
7+
|_| XML parser
8+
9+
Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
10+
Copyright (c) 2000-2017 Expat development team
11+
Licensed under the MIT license:
12+
13+
Permission is hereby granted, free of charge, to any person obtaining
14+
a copy of this software and associated documentation files (the
15+
"Software"), to deal in the Software without restriction, including
16+
without limitation the rights to use, copy, modify, merge, publish,
17+
distribute, sublicense, and/or sell copies of the Software, and to permit
18+
persons to whom the Software is furnished to do so, subject to the
19+
following conditions:
20+
21+
The above copyright notice and this permission notice shall be included
22+
in all copies or substantial portions of the Software.
23+
24+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
25+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
26+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
27+
NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
28+
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
29+
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
30+
USE OR OTHER DEALINGS IN THE SOFTWARE.
331
*/
432

533
#define ASCII_A 0x41

‎Modules/expat/asciitab.h

+30-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,33 @@
1-
/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
2-
See the file COPYING for copying permission.
1+
/*
2+
__ __ _
3+
___\ \/ /_ __ __ _| |_
4+
/ _ \\ /| '_ \ / _` | __|
5+
| __// \| |_) | (_| | |_
6+
\___/_/\_\ .__/ \__,_|\__|
7+
|_| XML parser
8+
9+
Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
10+
Copyright (c) 2000-2017 Expat development team
11+
Licensed under the MIT license:
12+
13+
Permission is hereby granted, free of charge, to any person obtaining
14+
a copy of this software and associated documentation files (the
15+
"Software"), to deal in the Software without restriction, including
16+
without limitation the rights to use, copy, modify, merge, publish,
17+
distribute, sublicense, and/or sell copies of the Software, and to permit
18+
persons to whom the Software is furnished to do so, subject to the
19+
following conditions:
20+
21+
The above copyright notice and this permission notice shall be included
22+
in all copies or substantial portions of the Software.
23+
24+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
25+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
26+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
27+
NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
28+
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
29+
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
30+
USE OR OTHER DEALINGS IN THE SOFTWARE.
331
*/
432

533
/* 0x00 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML,

‎Modules/expat/expat.h

+31-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,33 @@
1-
/* Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
2-
See the file COPYING for copying permission.
1+
/*
2+
__ __ _
3+
___\ \/ /_ __ __ _| |_
4+
/ _ \\ /| '_ \ / _` | __|
5+
| __// \| |_) | (_| | |_
6+
\___/_/\_\ .__/ \__,_|\__|
7+
|_| XML parser
8+
9+
Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
10+
Copyright (c) 2000-2017 Expat development team
11+
Licensed under the MIT license:
12+
13+
Permission is hereby granted, free of charge, to any person obtaining
14+
a copy of this software and associated documentation files (the
15+
"Software"), to deal in the Software without restriction, including
16+
without limitation the rights to use, copy, modify, merge, publish,
17+
distribute, sublicense, and/or sell copies of the Software, and to permit
18+
persons to whom the Software is furnished to do so, subject to the
19+
following conditions:
20+
21+
The above copyright notice and this permission notice shall be included
22+
in all copies or substantial portions of the Software.
23+
24+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
25+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
26+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
27+
NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
28+
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
29+
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
30+
USE OR OTHER DEALINGS IN THE SOFTWARE.
331
*/
432

533
#ifndef Expat_INCLUDED
@@ -1048,7 +1076,7 @@ XML_GetFeatureList(void);
10481076
*/
10491077
#define XML_MAJOR_VERSION 2
10501078
#define XML_MINOR_VERSION 2
1051-
#define XML_MICRO_VERSION 3
1079+
#define XML_MICRO_VERSION 4
10521080

10531081
#ifdef __cplusplus
10541082
}

‎Modules/expat/expat_external.h

+30-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,33 @@
1-
/* Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
2-
See the file COPYING for copying permission.
1+
/*
2+
__ __ _
3+
___\ \/ /_ __ __ _| |_
4+
/ _ \\ /| '_ \ / _` | __|
5+
| __// \| |_) | (_| | |_
6+
\___/_/\_\ .__/ \__,_|\__|
7+
|_| XML parser
8+
9+
Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
10+
Copyright (c) 2000-2017 Expat development team
11+
Licensed under the MIT license:
12+
13+
Permission is hereby granted, free of charge, to any person obtaining
14+
a copy of this software and associated documentation files (the
15+
"Software"), to deal in the Software without restriction, including
16+
without limitation the rights to use, copy, modify, merge, publish,
17+
distribute, sublicense, and/or sell copies of the Software, and to permit
18+
persons to whom the Software is furnished to do so, subject to the
19+
following conditions:
20+
21+
The above copyright notice and this permission notice shall be included
22+
in all copies or substantial portions of the Software.
23+
24+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
25+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
26+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
27+
NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
28+
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
29+
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
30+
USE OR OTHER DEALINGS IN THE SOFTWARE.
331
*/
432

533
#ifndef Expat_External_INCLUDED

‎Modules/expat/iasciitab.h

+30-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,33 @@
1-
/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
2-
See the file COPYING for copying permission.
1+
/*
2+
__ __ _
3+
___\ \/ /_ __ __ _| |_
4+
/ _ \\ /| '_ \ / _` | __|
5+
| __// \| |_) | (_| | |_
6+
\___/_/\_\ .__/ \__,_|\__|
7+
|_| XML parser
8+
9+
Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
10+
Copyright (c) 2000-2017 Expat development team
11+
Licensed under the MIT license:
12+
13+
Permission is hereby granted, free of charge, to any person obtaining
14+
a copy of this software and associated documentation files (the
15+
"Software"), to deal in the Software without restriction, including
16+
without limitation the rights to use, copy, modify, merge, publish,
17+
distribute, sublicense, and/or sell copies of the Software, and to permit
18+
persons to whom the Software is furnished to do so, subject to the
19+
following conditions:
20+
21+
The above copyright notice and this permission notice shall be included
22+
in all copies or substantial portions of the Software.
23+
24+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
25+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
26+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
27+
NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
28+
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
29+
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
30+
USE OR OTHER DEALINGS IN THE SOFTWARE.
331
*/
432

533
/* Like asciitab.h, except that 0xD has code BT_S rather than BT_CR */

‎Modules/expat/internal.h

+29
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,35 @@
1818
1919
Note: Use of these macros is based on judgement, not hard rules,
2020
and therefore subject to change.
21+
__ __ _
22+
___\ \/ /_ __ __ _| |_
23+
/ _ \\ /| '_ \ / _` | __|
24+
| __// \| |_) | (_| | |_
25+
\___/_/\_\ .__/ \__,_|\__|
26+
|_| XML parser
27+
28+
Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
29+
Copyright (c) 2000-2017 Expat development team
30+
Licensed under the MIT license:
31+
32+
Permission is hereby granted, free of charge, to any person obtaining
33+
a copy of this software and associated documentation files (the
34+
"Software"), to deal in the Software without restriction, including
35+
without limitation the rights to use, copy, modify, merge, publish,
36+
distribute, sublicense, and/or sell copies of the Software, and to permit
37+
persons to whom the Software is furnished to do so, subject to the
38+
following conditions:
39+
40+
The above copyright notice and this permission notice shall be included
41+
in all copies or substantial portions of the Software.
42+
43+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
44+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
45+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
46+
NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
47+
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
48+
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
49+
USE OR OTHER DEALINGS IN THE SOFTWARE.
2150
*/
2251

2352
#if defined(__GNUC__) && defined(__i386__) && !defined(__MINGW32__)

‎Modules/expat/latin1tab.h

+30-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,33 @@
1-
/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
2-
See the file COPYING for copying permission.
1+
/*
2+
__ __ _
3+
___\ \/ /_ __ __ _| |_
4+
/ _ \\ /| '_ \ / _` | __|
5+
| __// \| |_) | (_| | |_
6+
\___/_/\_\ .__/ \__,_|\__|
7+
|_| XML parser
8+
9+
Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
10+
Copyright (c) 2000-2017 Expat development team
11+
Licensed under the MIT license:
12+
13+
Permission is hereby granted, free of charge, to any person obtaining
14+
a copy of this software and associated documentation files (the
15+
"Software"), to deal in the Software without restriction, including
16+
without limitation the rights to use, copy, modify, merge, publish,
17+
distribute, sublicense, and/or sell copies of the Software, and to permit
18+
persons to whom the Software is furnished to do so, subject to the
19+
following conditions:
20+
21+
The above copyright notice and this permission notice shall be included
22+
in all copies or substantial portions of the Software.
23+
24+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
25+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
26+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
27+
NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
28+
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
29+
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
30+
USE OR OTHER DEALINGS IN THE SOFTWARE.
331
*/
432

533
/* 0x80 */ BT_OTHER, BT_OTHER, BT_OTHER, BT_OTHER,

‎Modules/expat/loadlibrary.c

+2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66
* \___|\___/|_| \_\_____|
77
*
88
* Copyright (C) 2016 - 2017, Steve Holme, <[email protected]>.
9+
* Copyright (C) 2017, Expat development team
910
*
1011
* All rights reserved.
12+
* Licensed under the MIT license:
1113
*
1214
* Permission to use, copy, modify, and distribute this software for any
1315
* purpose with or without fee is hereby granted, provided that the above

‎Modules/expat/nametab.h

+32
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,35 @@
1+
/*
2+
__ __ _
3+
___\ \/ /_ __ __ _| |_
4+
/ _ \\ /| '_ \ / _` | __|
5+
| __// \| |_) | (_| | |_
6+
\___/_/\_\ .__/ \__,_|\__|
7+
|_| XML parser
8+
9+
Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
10+
Copyright (c) 2000-2017 Expat development team
11+
Licensed under the MIT license:
12+
13+
Permission is hereby granted, free of charge, to any person obtaining
14+
a copy of this software and associated documentation files (the
15+
"Software"), to deal in the Software without restriction, including
16+
without limitation the rights to use, copy, modify, merge, publish,
17+
distribute, sublicense, and/or sell copies of the Software, and to permit
18+
persons to whom the Software is furnished to do so, subject to the
19+
following conditions:
20+
21+
The above copyright notice and this permission notice shall be included
22+
in all copies or substantial portions of the Software.
23+
24+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
25+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
26+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
27+
NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
28+
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
29+
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
30+
USE OR OTHER DEALINGS IN THE SOFTWARE.
31+
*/
32+
133
static const unsigned namingBitmap[] = {
234
0x00000000, 0x00000000, 0x00000000, 0x00000000,
335
0x00000000, 0x00000000, 0x00000000, 0x00000000,

‎Modules/expat/utf8tab.h

+30-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,34 @@
1-
/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
2-
See the file COPYING for copying permission.
3-
*/
1+
/*
2+
__ __ _
3+
___\ \/ /_ __ __ _| |_
4+
/ _ \\ /| '_ \ / _` | __|
5+
| __// \| |_) | (_| | |_
6+
\___/_/\_\ .__/ \__,_|\__|
7+
|_| XML parser
8+
9+
Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
10+
Copyright (c) 2000-2017 Expat development team
11+
Licensed under the MIT license:
12+
13+
Permission is hereby granted, free of charge, to any person obtaining
14+
a copy of this software and associated documentation files (the
15+
"Software"), to deal in the Software without restriction, including
16+
without limitation the rights to use, copy, modify, merge, publish,
17+
distribute, sublicense, and/or sell copies of the Software, and to permit
18+
persons to whom the Software is furnished to do so, subject to the
19+
following conditions:
420
21+
The above copyright notice and this permission notice shall be included
22+
in all copies or substantial portions of the Software.
23+
24+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
25+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
26+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
27+
NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
28+
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
29+
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
30+
USE OR OTHER DEALINGS IN THE SOFTWARE.
31+
*/
532

633
/* 0x80 */ BT_TRAIL, BT_TRAIL, BT_TRAIL, BT_TRAIL,
734
/* 0x84 */ BT_TRAIL, BT_TRAIL, BT_TRAIL, BT_TRAIL,

‎Modules/expat/winconfig.h

+30-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,33 @@
1-
/*================================================================
2-
** Copyright 2000, Clark Cooper
3-
** All rights reserved.
4-
**
5-
** This is free software. You are permitted to copy, distribute, or modify
6-
** it under the terms of the MIT/X license (contained in the COPYING file
7-
** with this distribution.)
1+
/*
2+
__ __ _
3+
___\ \/ /_ __ __ _| |_
4+
/ _ \\ /| '_ \ / _` | __|
5+
| __// \| |_) | (_| | |_
6+
\___/_/\_\ .__/ \__,_|\__|
7+
|_| XML parser
8+
9+
Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
10+
Copyright (c) 2000-2017 Expat development team
11+
Licensed under the MIT license:
12+
13+
Permission is hereby granted, free of charge, to any person obtaining
14+
a copy of this software and associated documentation files (the
15+
"Software"), to deal in the Software without restriction, including
16+
without limitation the rights to use, copy, modify, merge, publish,
17+
distribute, sublicense, and/or sell copies of the Software, and to permit
18+
persons to whom the Software is furnished to do so, subject to the
19+
following conditions:
20+
21+
The above copyright notice and this permission notice shall be included
22+
in all copies or substantial portions of the Software.
23+
24+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
25+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
26+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
27+
NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
28+
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
29+
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
30+
USE OR OTHER DEALINGS IN THE SOFTWARE.
831
*/
932

1033
#ifndef WINCONFIG_H

0 commit comments

Comments
 (0)