merge heads
This commit is contained in:
Benjamin Peterson
commit
191a8f0a34
|
|
@ -248,7 +248,8 @@ Configure IDLE
|
|||
help sources can be specified. Non-default user setting are saved in a
|
||||
.idlerc directory in the user's home directory. Problems caused by bad user
|
||||
configuration files are solved by editing or deleting one or more of the
|
||||
files in .idlerc.
|
||||
files in .idlerc. On OS X, open the configuration dialog by selecting
|
||||
Preferences in the application menu.
|
||||
|
||||
Configure Extensions
|
||||
Open a configuration dialog for setting preferences for extensions
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ test runner
|
|||
Module :mod:`doctest`
|
||||
Another test-support module with a very different flavor.
|
||||
|
||||
`Simple Smalltalk Testing: With Patterns <http://www.XProgramming.com/testfram.htm>`_
|
||||
`Simple Smalltalk Testing: With Patterns <https://web.archive.org/web/20150315073817/http://www.xprogramming.com/testfram.htm>`_
|
||||
Kent Beck's original paper on testing frameworks using the pattern shared
|
||||
by :mod:`unittest`.
|
||||
|
||||
|
|
|
|||
|
|
@ -2261,6 +2261,10 @@ PyAPI_FUNC(PyObject*) _PyUnicode_FromId(_Py_Identifier*);
|
|||
/* Clear all static strings. */
|
||||
PyAPI_FUNC(void) _PyUnicode_ClearStaticStrings(void);
|
||||
|
||||
/* Fast equality check when the inputs are known to be exact unicode types
|
||||
and where the hash values are equal (i.e. a very probable match) */
|
||||
PyAPI_FUNC(int) _PyUnicode_EQ(PyObject *, PyObject *);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -129,7 +129,9 @@ Options Menu (Shell and Editor):
|
|||
Configure IDLE -- Open a configuration dialog. Fonts, indentation,
|
||||
keybindings, and color themes may be altered.
|
||||
Startup Preferences may be set, and additional Help
|
||||
sources can be specified.
|
||||
sources can be specified. On OS X, open the
|
||||
configuration dialog by selecting Preferences
|
||||
in the application menu.
|
||||
|
||||
---
|
||||
Code Context (toggle) -- Open a pane at the top of the edit window
|
||||
|
|
|
|||
|
|
@ -237,9 +237,9 @@ def library_recipes():
|
|||
|
||||
result.extend([
|
||||
dict(
|
||||
name="OpenSSL 1.0.2a",
|
||||
url="https://www.openssl.org/source/openssl-1.0.2a.tar.gz",
|
||||
checksum='a06c547dac9044161a477211049f60ef',
|
||||
name="OpenSSL 1.0.2c",
|
||||
url="https://www.openssl.org/source/openssl-1.0.2c.tar.gz",
|
||||
checksum='8c8d81a9ae7005276e486702edbcd4b6',
|
||||
patches=[
|
||||
"openssl_sdk_makedepend.patch",
|
||||
],
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Parent 25a9af415e8c3faf591c360d5f0e361d049b2b43
|
||||
# openssl_sdk_makedepend.patch
|
||||
#
|
||||
# using openssl 1.0.2a
|
||||
# using openssl 1.0.2c
|
||||
#
|
||||
# - support building with an OS X SDK
|
||||
# - allow "make depend" to use compilers with names other than "gcc"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
|
||||
{\rtf1\ansi\ansicpg1252\cocoartf1348\cocoasubrtf170
|
||||
{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 CourierNewPSMT;}
|
||||
{\colortbl;\red255\green255\blue255;}
|
||||
\margl1440\margr1440\vieww13380\viewh14600\viewkind0
|
||||
|
|
@ -24,7 +24,7 @@ Python.org provides two installer variants for download: one that installs a
|
|||
\i0 variant. Unless you are installing to an 10.5 system or you need to build applications that can run on 10.5 systems, use the 10.6 variant if possible. There are some additional operating system functions that are supported starting with 10.6 and you may see better performance using 64-bit mode. By default, Python will automatically run in 64-bit mode if your system supports it. Also see
|
||||
\i Certificate verification and OpenSSL
|
||||
\i0 below. The Pythons installed by these installers are built with private copies of some third-party libraries not included with or newer than those in OS X itself. The list of these libraries varies by installer variant and is included at the end of the License.rtf file.
|
||||
\b \ul \ulc0 \
|
||||
\b \ul \
|
||||
\
|
||||
Update your version of Tcl/Tk to use IDLE or other Tk applications
|
||||
\b0 \ulnone \
|
||||
|
|
@ -36,6 +36,71 @@ To use IDLE or other programs that use the Tkinter graphical user interface tool
|
|||
\i0 for this version of Python and of Mac OS X.\
|
||||
|
||||
\b \ul \
|
||||
Certificate verification and OpenSSL\
|
||||
|
||||
\b0 \ulnone \
|
||||
Python 3.5 includes a number of network security enhancements that were released in Python 3.4.3 and Python 2.7.10. {\field{\*\fldinst{HYPERLINK "https://www.python.org/dev/peps/pep-0476/"}}{\fldrslt PEP 476}} changes several standard library modules, like
|
||||
\i httplib
|
||||
\i0 ,
|
||||
\i urllib
|
||||
\i0 , and
|
||||
\i xmlrpclib
|
||||
\i0 , to by default verify certificates presented by servers over secure (TLS) connections. The verification is performed by the OpenSSL libraries that Python is linked to. Prior to 3.4.3, both python.org installers dynamically linked with Apple-supplied OpenSSL libraries shipped with OS X. OS X provides a multiple level security framework that stores trust certificates in system and user keychains managed by the
|
||||
\i Keychain Access
|
||||
\i0 application and the
|
||||
\i security
|
||||
\i0 command line utility.\
|
||||
\
|
||||
For OS X 10.5, Apple provides
|
||||
\i OpenSSL 0.9.7
|
||||
\i0 libraries. This version of Apple's OpenSSL
|
||||
\b does not
|
||||
\b0 use the certificates from the system security framework, even when used on newer versions of OS X. Instead it consults a traditional OpenSSL concatenated certificate file (
|
||||
\i cafile
|
||||
\i0 ) or certificate directory (
|
||||
\i capath
|
||||
\i0 ), located in
|
||||
\f1 /System/Library/OpenSSL
|
||||
\f0 . These directories are typically empty and not managed by OS X; you must manage them yourself or supply your own SSL contexts. OpenSSL 0.9.7 is obsolete by current security standards, lacking a number of important features found in later versions. Among the problems this causes is the inability to verify higher-security certificates now used by python.org services, including
|
||||
\i t{\field{\*\fldinst{HYPERLINK "https://pypi.python.org/pypi"}}{\fldrslt he Python Package Index, PyPI}}
|
||||
\i0 . To solve this problem, the
|
||||
\i 10.5+ 32-bit-only python.org variant
|
||||
\i0 is linked with a private copy of
|
||||
\i OpenSSL 1.0.2
|
||||
\i0 ; it consults the same default certificate directory,
|
||||
\f1 /System/Library/OpenSSL
|
||||
\f0 . As before, it is still necessary to manage certificates yourself when you use this Python variant and, with certificate verification now enabled by default, you may now need to take additional steps to ensure your Python programs have access to CA certificates you trust. If you use this Python variant to build standalone applications with third-party tools like {\field{\*\fldinst{HYPERLINK "https://pypi.python.org/pypi/py2app/"}}{\fldrslt
|
||||
\f1 py2app}}, you may now need to bundle CA certificates in them or otherwise supply non-default SSL contexts.\
|
||||
\
|
||||
For OS X 10.6+, Apple also provides
|
||||
\i OpenSSL
|
||||
\i0
|
||||
\i 0.9.8 libraries
|
||||
\i0 . Apple's 0.9.8 version includes an important additional feature: if a certificate cannot be verified using the manually administered certificates in
|
||||
\f1 /System/Library/OpenSSL
|
||||
\f0 , the certificates managed by the system security framework In the user and system keychains are also consulted (using Apple private APIs). For this reason, the
|
||||
\i 64-bit/32-bit 10.6+ python.org variant
|
||||
\i0 continues to be dynamically linked with Apple's OpenSSL 0.9.8 since it was felt that the loss of the system-provided certificates and management tools outweighs the additional security features provided by newer versions of OpenSSL. This will likely change in future releases of the python.org installers as Apple has deprecated use of the system-supplied OpenSSL libraries. If you do need features from newer versions of OpenSSL, there are third-party OpenSSL wrapper packages available through
|
||||
\i PyPI
|
||||
\i0 .\
|
||||
\
|
||||
The bundled
|
||||
\f1 pip
|
||||
\f0 included with the Python 3.5 installers has its own default certificate store for verifying download connections.\
|
||||
\
|
||||
|
||||
\b \ul Other changes\
|
||||
|
||||
\b0 \ulnone \
|
||||
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
|
||||
\cf0 For other changes in this release, see the
|
||||
\i What's new
|
||||
\i0 section in the {\field{\*\fldinst{HYPERLINK "https://www.python.org/doc/"}}{\fldrslt Documentation Set}} for this release and its
|
||||
\i Release Notes
|
||||
\i0 link at {\field{\*\fldinst{HYPERLINK "https://www.python.org/downloads/"}}{\fldrslt https://www.python.org/downloads/}}.\
|
||||
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
|
||||
|
||||
\b \cf0 \ul \
|
||||
Python 3 and Python 2 Co-existence\
|
||||
|
||||
\b0 \ulnone \
|
||||
|
|
|
|||
|
|
@ -10,15 +10,15 @@ RELFWKBIN="../../..${FWK}/bin"
|
|||
|
||||
umask 022
|
||||
|
||||
"${FWK}/bin/python${PYVER}" -m ensurepip --upgrade
|
||||
"${FWK}/bin/python${PYVER}" -E -s -m ensurepip --upgrade
|
||||
|
||||
"${FWK}/bin/python${PYVER}" -Wi \
|
||||
"${FWK}/lib/python${PYVER}/compileall.py" \
|
||||
"${FWK}/bin/python${PYVER}" -E -s -Wi \
|
||||
"${FWK}/lib/python${PYVER}/compileall.py" -q -j0 \
|
||||
-f -x badsyntax \
|
||||
"${FWK}/lib/python${PYVER}/site-packages"
|
||||
|
||||
"${FWK}/bin/python${PYVER}" -Wi -O \
|
||||
"${FWK}/lib/python${PYVER}/compileall.py" \
|
||||
"${FWK}/bin/python${PYVER}" -E -s -Wi -O \
|
||||
"${FWK}/lib/python${PYVER}/compileall.py" -q -j0 \
|
||||
-f -x badsyntax \
|
||||
"${FWK}/lib/python${PYVER}/site-packages"
|
||||
|
||||
|
|
|
|||
|
|
@ -6,23 +6,23 @@
|
|||
PYVER="@PYVER@"
|
||||
FWK="/Library/Frameworks/Python.framework/Versions/@PYVER@"
|
||||
|
||||
"${FWK}/bin/python@PYVER@" -Wi \
|
||||
"${FWK}/lib/python${PYVER}/compileall.py" \
|
||||
"${FWK}/bin/python@PYVER@" -E -s -Wi \
|
||||
"${FWK}/lib/python${PYVER}/compileall.py" -q -j0 \
|
||||
-f -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
|
||||
"${FWK}/lib/python${PYVER}"
|
||||
|
||||
"${FWK}/bin/python@PYVER@" -Wi -O \
|
||||
"${FWK}/lib/python${PYVER}/compileall.py" \
|
||||
"${FWK}/bin/python@PYVER@" -E -s -Wi -O \
|
||||
"${FWK}/lib/python${PYVER}/compileall.py" -q -j0 \
|
||||
-f -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
|
||||
"${FWK}/lib/python${PYVER}"
|
||||
|
||||
"${FWK}/bin/python@PYVER@" -Wi \
|
||||
"${FWK}/lib/python${PYVER}/compileall.py" \
|
||||
"${FWK}/bin/python@PYVER@" -E -s -Wi \
|
||||
"${FWK}/lib/python${PYVER}/compileall.py" -q -j0 \
|
||||
-f -x badsyntax \
|
||||
"${FWK}/lib/python${PYVER}/site-packages"
|
||||
|
||||
"${FWK}/bin/python@PYVER@" -Wi -O \
|
||||
"${FWK}/lib/python${PYVER}/compileall.py" \
|
||||
"${FWK}/bin/python@PYVER@" -E -s -Wi -O \
|
||||
"${FWK}/lib/python${PYVER}/compileall.py" -q -j0 \
|
||||
-f -x badsyntax \
|
||||
"${FWK}/lib/python${PYVER}/site-packages"
|
||||
|
||||
|
|
|
|||
|
|
@ -118,6 +118,12 @@ Documentation
|
|||
- Issue #24351: Clarify what is meant by "identifier" in the context of
|
||||
string.Template instances.
|
||||
|
||||
Build
|
||||
-----
|
||||
|
||||
- Issue #24432: Update Windows builds and OS X 10.5 installer to use OpenSSL
|
||||
1.0.2c.
|
||||
|
||||
|
||||
What's New in Python 3.5.0 beta 2?
|
||||
==================================
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@
|
|||
|
||||
#include "Python.h"
|
||||
#include "structmember.h"
|
||||
#include "stringlib/eq.h"
|
||||
|
||||
/* Object used as dummy key to fill deleted entries */
|
||||
static PyObject _dummy_struct;
|
||||
|
|
@ -74,7 +73,7 @@ set_lookkey(PySetObject *so, PyObject *key, Py_hash_t hash)
|
|||
return entry;
|
||||
if (PyUnicode_CheckExact(startkey)
|
||||
&& PyUnicode_CheckExact(key)
|
||||
&& unicode_eq(startkey, key))
|
||||
&& _PyUnicode_EQ(startkey, key))
|
||||
return entry;
|
||||
Py_INCREF(startkey);
|
||||
cmp = PyObject_RichCompareBool(startkey, key, Py_EQ);
|
||||
|
|
@ -100,7 +99,7 @@ set_lookkey(PySetObject *so, PyObject *key, Py_hash_t hash)
|
|||
return entry;
|
||||
if (PyUnicode_CheckExact(startkey)
|
||||
&& PyUnicode_CheckExact(key)
|
||||
&& unicode_eq(startkey, key))
|
||||
&& _PyUnicode_EQ(startkey, key))
|
||||
return entry;
|
||||
Py_INCREF(startkey);
|
||||
cmp = PyObject_RichCompareBool(startkey, key, Py_EQ);
|
||||
|
|
@ -125,6 +124,8 @@ set_lookkey(PySetObject *so, PyObject *key, Py_hash_t hash)
|
|||
}
|
||||
}
|
||||
|
||||
static int set_table_resize(PySetObject *, Py_ssize_t);
|
||||
|
||||
static int
|
||||
set_insert_key(PySetObject *so, PyObject *key, Py_hash_t hash)
|
||||
{
|
||||
|
|
@ -139,7 +140,7 @@ set_insert_key(PySetObject *so, PyObject *key, Py_hash_t hash)
|
|||
|
||||
entry = &table[i];
|
||||
if (entry->key == NULL)
|
||||
goto found_null_first;
|
||||
goto found_unused;
|
||||
|
||||
freeslot = NULL;
|
||||
perturb = hash;
|
||||
|
|
@ -153,7 +154,7 @@ set_insert_key(PySetObject *so, PyObject *key, Py_hash_t hash)
|
|||
goto found_active;
|
||||
if (PyUnicode_CheckExact(startkey)
|
||||
&& PyUnicode_CheckExact(key)
|
||||
&& unicode_eq(startkey, key))
|
||||
&& _PyUnicode_EQ(startkey, key))
|
||||
goto found_active;
|
||||
Py_INCREF(startkey);
|
||||
cmp = PyObject_RichCompareBool(startkey, key, Py_EQ);
|
||||
|
|
@ -173,7 +174,7 @@ set_insert_key(PySetObject *so, PyObject *key, Py_hash_t hash)
|
|||
for (j = 0 ; j < LINEAR_PROBES ; j++) {
|
||||
entry++;
|
||||
if (entry->hash == 0 && entry->key == NULL)
|
||||
goto found_null;
|
||||
goto found_unused_or_dummy;
|
||||
if (entry->hash == hash) {
|
||||
PyObject *startkey = entry->key;
|
||||
assert(startkey != dummy);
|
||||
|
|
@ -181,7 +182,7 @@ set_insert_key(PySetObject *so, PyObject *key, Py_hash_t hash)
|
|||
goto found_active;
|
||||
if (PyUnicode_CheckExact(startkey)
|
||||
&& PyUnicode_CheckExact(key)
|
||||
&& unicode_eq(startkey, key))
|
||||
&& _PyUnicode_EQ(startkey, key))
|
||||
goto found_active;
|
||||
Py_INCREF(startkey);
|
||||
cmp = PyObject_RichCompareBool(startkey, key, Py_EQ);
|
||||
|
|
@ -204,30 +205,27 @@ set_insert_key(PySetObject *so, PyObject *key, Py_hash_t hash)
|
|||
|
||||
entry = &table[i];
|
||||
if (entry->key == NULL)
|
||||
goto found_null;
|
||||
goto found_unused_or_dummy;
|
||||
}
|
||||
|
||||
found_null_first:
|
||||
found_unused_or_dummy:
|
||||
if (freeslot == NULL)
|
||||
goto found_unused;
|
||||
Py_INCREF(key);
|
||||
so->used++;
|
||||
freeslot->key = key;
|
||||
freeslot->hash = hash;
|
||||
return 0;
|
||||
|
||||
found_unused:
|
||||
Py_INCREF(key);
|
||||
so->fill++;
|
||||
so->used++;
|
||||
entry->key = key;
|
||||
entry->hash = hash;
|
||||
return 0;
|
||||
|
||||
found_null:
|
||||
Py_INCREF(key);
|
||||
if (freeslot == NULL) {
|
||||
/* UNUSED */
|
||||
so->fill++;
|
||||
} else {
|
||||
/* DUMMY */
|
||||
entry = freeslot;
|
||||
}
|
||||
so->used++;
|
||||
entry->key = key;
|
||||
entry->hash = hash;
|
||||
return 0;
|
||||
if ((size_t)so->fill*3 < mask*2)
|
||||
return 0;
|
||||
return set_table_resize(so, so->used);
|
||||
|
||||
found_active:
|
||||
return 0;
|
||||
|
|
@ -291,6 +289,7 @@ set_table_resize(PySetObject *so, Py_ssize_t minused)
|
|||
setentry small_copy[PySet_MINSIZE];
|
||||
|
||||
assert(minused >= 0);
|
||||
minused = (minused > 50000) ? minused * 2 : minused * 4;
|
||||
|
||||
/* Find the smallest table size > minused. */
|
||||
/* XXX speed-up with intrinsics */
|
||||
|
|
@ -366,28 +365,15 @@ set_table_resize(PySetObject *so, Py_ssize_t minused)
|
|||
return 0;
|
||||
}
|
||||
|
||||
/* CAUTION: set_add_key/entry() must guarantee it won't resize the table */
|
||||
|
||||
static int
|
||||
set_add_entry(PySetObject *so, setentry *entry)
|
||||
{
|
||||
Py_ssize_t n_used;
|
||||
PyObject *key = entry->key;
|
||||
Py_hash_t hash = entry->hash;
|
||||
|
||||
assert(so->fill <= so->mask); /* at least one empty slot */
|
||||
n_used = so->used;
|
||||
if (set_insert_key(so, key, hash))
|
||||
return -1;
|
||||
if (!(so->used > n_used && so->fill*3 >= (so->mask+1)*2))
|
||||
return 0;
|
||||
return set_table_resize(so, so->used>50000 ? so->used*2 : so->used*4);
|
||||
return set_insert_key(so, entry->key, entry->hash);
|
||||
}
|
||||
|
||||
static int
|
||||
set_add_key(PySetObject *so, PyObject *key)
|
||||
{
|
||||
setentry entry;
|
||||
Py_hash_t hash;
|
||||
|
||||
if (!PyUnicode_CheckExact(key) ||
|
||||
|
|
@ -396,9 +382,7 @@ set_add_key(PySetObject *so, PyObject *key)
|
|||
if (hash == -1)
|
||||
return -1;
|
||||
}
|
||||
entry.key = key;
|
||||
entry.hash = hash;
|
||||
return set_add_entry(so, &entry);
|
||||
return set_insert_key(so, key, hash);
|
||||
}
|
||||
|
||||
#define DISCARD_NOTFOUND 0
|
||||
|
|
@ -631,8 +615,8 @@ set_merge(PySetObject *so, PyObject *otherset)
|
|||
* incrementally resizing as we insert new keys. Expect
|
||||
* that there will be no (or few) overlapping keys.
|
||||
*/
|
||||
if ((so->fill + other->used)*3 >= (so->mask+1)*2) {
|
||||
if (set_table_resize(so, (so->used + other->used)*2) != 0)
|
||||
if ((so->fill + other->used)*3 >= so->mask*2) {
|
||||
if (set_table_resize(so, so->used + other->used) != 0)
|
||||
return -1;
|
||||
}
|
||||
so_entry = so->table;
|
||||
|
|
@ -694,7 +678,7 @@ set_contains_entry(PySetObject *so, setentry *entry)
|
|||
static int
|
||||
set_contains_key(PySetObject *so, PyObject *key)
|
||||
{
|
||||
setentry entry;
|
||||
setentry *entry;
|
||||
Py_hash_t hash;
|
||||
|
||||
if (!PyUnicode_CheckExact(key) ||
|
||||
|
|
@ -703,9 +687,10 @@ set_contains_key(PySetObject *so, PyObject *key)
|
|||
if (hash == -1)
|
||||
return -1;
|
||||
}
|
||||
entry.key = key;
|
||||
entry.hash = hash;
|
||||
return set_contains_entry(so, &entry);
|
||||
entry = set_lookkey(so, key, hash);
|
||||
if (entry == NULL)
|
||||
return -1;
|
||||
return entry->key != NULL;
|
||||
}
|
||||
|
||||
static PyObject *
|
||||
|
|
@ -977,18 +962,14 @@ set_update_internal(PySetObject *so, PyObject *other)
|
|||
* incrementally resizing as we insert new keys. Expect
|
||||
* that there will be no (or few) overlapping keys.
|
||||
*/
|
||||
if (dictsize == -1)
|
||||
if (dictsize < 0)
|
||||
return -1;
|
||||
if ((so->fill + dictsize)*3 >= (so->mask+1)*2) {
|
||||
if (set_table_resize(so, (so->used + dictsize)*2) != 0)
|
||||
if ((so->fill + dictsize)*3 >= so->mask*2) {
|
||||
if (set_table_resize(so, so->used + dictsize) != 0)
|
||||
return -1;
|
||||
}
|
||||
while (_PyDict_Next(other, &pos, &key, &value, &hash)) {
|
||||
setentry an_entry;
|
||||
|
||||
an_entry.hash = hash;
|
||||
an_entry.key = key;
|
||||
if (set_add_entry(so, &an_entry))
|
||||
if (set_insert_key(so, key, hash))
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
|
|
@ -1288,7 +1269,7 @@ set_intersection(PySetObject *so, PyObject *other)
|
|||
|
||||
while (set_next((PySetObject *)other, &pos, &entry)) {
|
||||
int rv = set_contains_entry(so, entry);
|
||||
if (rv == -1) {
|
||||
if (rv < 0) {
|
||||
Py_DECREF(result);
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -1322,7 +1303,7 @@ set_intersection(PySetObject *so, PyObject *other)
|
|||
entry.hash = hash;
|
||||
entry.key = key;
|
||||
rv = set_contains_entry(so, &entry);
|
||||
if (rv == -1) {
|
||||
if (rv < 0) {
|
||||
Py_DECREF(it);
|
||||
Py_DECREF(result);
|
||||
Py_DECREF(key);
|
||||
|
|
@ -1449,7 +1430,7 @@ set_isdisjoint(PySetObject *so, PyObject *other)
|
|||
}
|
||||
while (set_next((PySetObject *)other, &pos, &entry)) {
|
||||
int rv = set_contains_entry(so, entry);
|
||||
if (rv == -1)
|
||||
if (rv < 0)
|
||||
return NULL;
|
||||
if (rv)
|
||||
Py_RETURN_FALSE;
|
||||
|
|
@ -1475,7 +1456,7 @@ set_isdisjoint(PySetObject *so, PyObject *other)
|
|||
entry.key = key;
|
||||
rv = set_contains_entry(so, &entry);
|
||||
Py_DECREF(key);
|
||||
if (rv == -1) {
|
||||
if (rv < 0) {
|
||||
Py_DECREF(it);
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -1504,7 +1485,7 @@ set_difference_update_internal(PySetObject *so, PyObject *other)
|
|||
Py_ssize_t pos = 0;
|
||||
|
||||
while (set_next((PySetObject *)other, &pos, &entry))
|
||||
if (set_discard_entry(so, entry) == -1)
|
||||
if (set_discard_entry(so, entry) < 0)
|
||||
return -1;
|
||||
} else {
|
||||
PyObject *key, *it;
|
||||
|
|
@ -1513,7 +1494,7 @@ set_difference_update_internal(PySetObject *so, PyObject *other)
|
|||
return -1;
|
||||
|
||||
while ((key = PyIter_Next(it)) != NULL) {
|
||||
if (set_discard_key(so, key) == -1) {
|
||||
if (set_discard_key(so, key) < 0) {
|
||||
Py_DECREF(it);
|
||||
Py_DECREF(key);
|
||||
return -1;
|
||||
|
|
@ -1524,10 +1505,10 @@ set_difference_update_internal(PySetObject *so, PyObject *other)
|
|||
if (PyErr_Occurred())
|
||||
return -1;
|
||||
}
|
||||
/* If more than 1/5 are dummies, then resize them away. */
|
||||
if ((so->fill - so->used) * 5 < so->mask)
|
||||
/* If more than 1/4th are dummies, then resize them away. */
|
||||
if ((size_t)(so->fill - so->used) <= (size_t)so->mask / 4)
|
||||
return 0;
|
||||
return set_table_resize(so, so->used>50000 ? so->used*2 : so->used*4);
|
||||
return set_table_resize(so, so->used);
|
||||
}
|
||||
|
||||
static PyObject *
|
||||
|
|
@ -1554,7 +1535,7 @@ set_copy_and_difference(PySetObject *so, PyObject *other)
|
|||
result = set_copy(so);
|
||||
if (result == NULL)
|
||||
return NULL;
|
||||
if (set_difference_update_internal((PySetObject *) result, other) != -1)
|
||||
if (set_difference_update_internal((PySetObject *) result, other) == 0)
|
||||
return result;
|
||||
Py_DECREF(result);
|
||||
return NULL;
|
||||
|
|
@ -1583,17 +1564,16 @@ set_difference(PySetObject *so, PyObject *other)
|
|||
|
||||
if (PyDict_CheckExact(other)) {
|
||||
while (set_next(so, &pos, &entry)) {
|
||||
setentry entrycopy;
|
||||
PyObject *key = entry->key;
|
||||
Py_hash_t hash = entry->hash;
|
||||
int rv;
|
||||
entrycopy.hash = entry->hash;
|
||||
entrycopy.key = entry->key;
|
||||
rv = _PyDict_Contains(other, entry->key, entry->hash);
|
||||
rv = _PyDict_Contains(other, key, hash);
|
||||
if (rv < 0) {
|
||||
Py_DECREF(result);
|
||||
return NULL;
|
||||
}
|
||||
if (!rv) {
|
||||
if (set_add_entry((PySetObject *)result, &entrycopy)) {
|
||||
if (set_insert_key((PySetObject *)result, key, hash)) {
|
||||
Py_DECREF(result);
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -1605,7 +1585,7 @@ set_difference(PySetObject *so, PyObject *other)
|
|||
/* Iterate over so, checking for common elements in other. */
|
||||
while (set_next(so, &pos, &entry)) {
|
||||
int rv = set_contains_entry((PySetObject *)other, entry);
|
||||
if (rv == -1) {
|
||||
if (rv < 0) {
|
||||
Py_DECREF(result);
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -1689,7 +1669,7 @@ set_symmetric_difference_update(PySetObject *so, PyObject *other)
|
|||
an_entry.key = key;
|
||||
|
||||
rv = set_discard_entry(so, &an_entry);
|
||||
if (rv == -1) {
|
||||
if (rv < 0) {
|
||||
Py_DECREF(key);
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -1715,7 +1695,7 @@ set_symmetric_difference_update(PySetObject *so, PyObject *other)
|
|||
|
||||
while (set_next(otherset, &pos, &entry)) {
|
||||
int rv = set_discard_entry(so, entry);
|
||||
if (rv == -1) {
|
||||
if (rv < 0) {
|
||||
Py_DECREF(otherset);
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -1797,7 +1777,7 @@ set_issubset(PySetObject *so, PyObject *other)
|
|||
|
||||
while (set_next(so, &pos, &entry)) {
|
||||
int rv = set_contains_entry((PySetObject *)other, entry);
|
||||
if (rv == -1)
|
||||
if (rv < 0)
|
||||
return NULL;
|
||||
if (!rv)
|
||||
Py_RETURN_FALSE;
|
||||
|
|
@ -1888,7 +1868,7 @@ set_contains(PySetObject *so, PyObject *key)
|
|||
int rv;
|
||||
|
||||
rv = set_contains_key(so, key);
|
||||
if (rv == -1) {
|
||||
if (rv < 0) {
|
||||
if (!PySet_Check(key) || !PyErr_ExceptionMatches(PyExc_TypeError))
|
||||
return -1;
|
||||
PyErr_Clear();
|
||||
|
|
@ -1907,7 +1887,7 @@ set_direct_contains(PySetObject *so, PyObject *key)
|
|||
long result;
|
||||
|
||||
result = set_contains(so, key);
|
||||
if (result == -1)
|
||||
if (result < 0)
|
||||
return NULL;
|
||||
return PyBool_FromLong(result);
|
||||
}
|
||||
|
|
@ -1921,7 +1901,7 @@ set_remove(PySetObject *so, PyObject *key)
|
|||
int rv;
|
||||
|
||||
rv = set_discard_key(so, key);
|
||||
if (rv == -1) {
|
||||
if (rv < 0) {
|
||||
if (!PySet_Check(key) || !PyErr_ExceptionMatches(PyExc_TypeError))
|
||||
return NULL;
|
||||
PyErr_Clear();
|
||||
|
|
@ -1930,7 +1910,7 @@ set_remove(PySetObject *so, PyObject *key)
|
|||
return NULL;
|
||||
rv = set_discard_key(so, tmpkey);
|
||||
Py_DECREF(tmpkey);
|
||||
if (rv == -1)
|
||||
if (rv < 0)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
@ -1953,7 +1933,7 @@ set_discard(PySetObject *so, PyObject *key)
|
|||
int rv;
|
||||
|
||||
rv = set_discard_key(so, key);
|
||||
if (rv == -1) {
|
||||
if (rv < 0) {
|
||||
if (!PySet_Check(key) || !PyErr_ExceptionMatches(PyExc_TypeError))
|
||||
return NULL;
|
||||
PyErr_Clear();
|
||||
|
|
@ -1962,7 +1942,7 @@ set_discard(PySetObject *so, PyObject *key)
|
|||
return NULL;
|
||||
rv = set_discard_key(so, tmpkey);
|
||||
Py_DECREF(tmpkey);
|
||||
if (rv == -1)
|
||||
if (rv < 0)
|
||||
return NULL;
|
||||
}
|
||||
Py_RETURN_NONE;
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|||
#include "Python.h"
|
||||
#include "ucnhash.h"
|
||||
#include "bytes_methods.h"
|
||||
#include "stringlib/eq.h"
|
||||
|
||||
#ifdef MS_WINDOWS
|
||||
#include <windows.h>
|
||||
|
|
@ -10886,6 +10887,12 @@ PyUnicode_RichCompare(PyObject *left, PyObject *right, int op)
|
|||
return v;
|
||||
}
|
||||
|
||||
int
|
||||
_PyUnicode_EQ(PyObject *aa, PyObject *bb)
|
||||
{
|
||||
return unicode_eq(aa, bb);
|
||||
}
|
||||
|
||||
int
|
||||
PyUnicode_Contains(PyObject *container, PyObject *element)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ echo.Fetching external libraries...
|
|||
for %%e in (
|
||||
bzip2-1.0.6
|
||||
nasm-2.11.06
|
||||
openssl-1.0.2a
|
||||
openssl-1.0.2c
|
||||
tcl-core-8.6.4.1
|
||||
tk-8.6.4.1
|
||||
tix-8.4.3.4
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
#! /usr/bin/env python3
|
||||
# Script for preparing OpenSSL for building on Windows.
|
||||
# Uses Perl to create nmake makefiles and otherwise prepare the way
|
||||
# for building on 32 or 64 bit platforms.
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
<sqlite3Dir>$(ExternalsDir)sqlite-3.8.3.1\</sqlite3Dir>
|
||||
<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
|
||||
<lzmaDir>$(ExternalsDir)xz-5.0.5\</lzmaDir>
|
||||
<opensslDir>$(ExternalsDir)openssl-1.0.2a\</opensslDir>
|
||||
<opensslDir>$(ExternalsDir)openssl-1.0.2c\</opensslDir>
|
||||
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
|
||||
|
||||
<!-- Suffix for all binaries when building for debug -->
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@
|
|||
</_Lines>
|
||||
</ItemGroup>
|
||||
<MakeDir Directories="$(IntDir)" />
|
||||
<WriteLinesToFile File="$(IntDir)python3_d.def" Lines="@(_Lines->'%(New)')" />
|
||||
<WriteLinesToFile File="$(IntDir)python3_d.def" Lines="@(_Lines->'%(New)')" Overwrite="true" />
|
||||
</Target>
|
||||
|
||||
<Target Name="BuildStubDef" BeforeTargets="PreLinkEvent" Inputs="..\PC\python3.def" Outputs="$(IntDir)python3stub.def">
|
||||
|
|
@ -132,7 +132,7 @@
|
|||
<_Lines Include="@(_Symbols->'%(Symbol)')" />
|
||||
</ItemGroup>
|
||||
<MakeDir Directories="$(IntDir)" />
|
||||
<WriteLinesToFile File="$(IntDir)python3stub.def" Lines="@(_Lines)" />
|
||||
<WriteLinesToFile File="$(IntDir)python3stub.def" Lines="@(_Lines)" Overwrite="true" />
|
||||
</Target>
|
||||
<Target Name="_CleanStubDef" BeforeTargets="CoreClean">
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -197,7 +197,7 @@ _lzma
|
|||
Homepage:
|
||||
http://tukaani.org/xz/
|
||||
_ssl
|
||||
Python wrapper for version 1.0.1j of the OpenSSL secure sockets
|
||||
Python wrapper for version 1.0.2c of the OpenSSL secure sockets
|
||||
library, which is built by ssl.vcxproj
|
||||
Homepage:
|
||||
http://www.openssl.org/
|
||||
|
|
|
|||
|
|
@ -8,9 +8,10 @@ set BUILDX64=
|
|||
set BUILDDOC=
|
||||
|
||||
:CheckOpts
|
||||
if '%1'=='-x86' (set BUILDX86=1) && shift && goto CheckOpts
|
||||
if '%1'=='-x64' (set BUILDX64=1) && shift && goto CheckOpts
|
||||
if '%1'=='--doc' (set BUILDDOC=1) && shift && goto CheckOpts
|
||||
if "%1" EQU "-h" goto Help
|
||||
if "%1" EQU "-x86" (set BUILDX86=1) && shift && goto CheckOpts
|
||||
if "%1" EQU "-x64" (set BUILDX64=1) && shift && goto CheckOpts
|
||||
if "%1" EQU "--doc" (set BUILDDOC=1) && shift && goto CheckOpts
|
||||
|
||||
if not defined BUILDX86 if not defined BUILDX64 (set BUILDX86=1) && (set BUILDX64=1)
|
||||
|
||||
|
|
@ -44,3 +45,12 @@ if defined BUILDX64 (
|
|||
msbuild "%D%bundle\snapshot.wixproj" /p:Platform=x64
|
||||
if errorlevel 1 goto :eof
|
||||
)
|
||||
|
||||
exit /B 0
|
||||
|
||||
:Help
|
||||
echo build.bat [-x86] [-x64] [--doc] [-h]
|
||||
echo.
|
||||
echo -x86 Build x86 installers
|
||||
echo -x64 Build x64 installers
|
||||
echo --doc Build CHM documentation
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
<MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
|
||||
</MsiPackage>
|
||||
|
||||
<?define CompileAllCommand=-$(var.ShortVersion)$(var.Suffix32) -Wi "[TargetDir]\Lib\compileall.py" -f -x "bad_coding|badsyntax|site-packages|py2_|lib2to3\\tests|venv\\scripts" "[TargetDir]\Lib"?>
|
||||
<?define CompileAllCommand=-$(var.ShortVersion)$(var.Suffix32) -E -s -Wi "[TargetDir]\Lib\compileall.py" -f -x "bad_coding|badsyntax|site-packages|py2_|lib2to3\\tests|venv\\scripts" "[TargetDir]\Lib"?>
|
||||
<ExePackage Id="compileall_AllUsers"
|
||||
SourceFile="py.exe"
|
||||
Compressed="yes"
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<Target Name="_TransformWxlTemplates" AfterTargets="PrepareForBuild" Inputs="@(WxlTemplate)" Outputs="$(IntermediateOutputPath)%(Filename).wxl">
|
||||
<Target Name="_TransformWxlTemplates" AfterTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<_Content>$([System.IO.File]::ReadAllText(%(WxlTemplate.FullPath)).Replace(`{{ShortVersion}}`, `$(MajorVersionNumber).$(MinorVersionNumber)`).Replace(`{{LongVersion}}`, `$(PythonVersion)`).Replace(`{{Bitness}}`, `$(Bitness)`))</_Content>
|
||||
<_ExistingContent Condition="Exists('$(IntermediateOutputPath)%(WxlTemplate.Filename).wxl')">$([System.IO.File]::ReadAllText($(IntermediateOutputPath)%(WxlTemplate.Filename).wxl))</_ExistingContent>
|
||||
|
|
|
|||
|
|
@ -27,8 +27,8 @@
|
|||
<?endif ?>
|
||||
|
||||
<!-- Install/uninstall pip -->
|
||||
<CustomAction Id="SetUpdatePipCommandLine" Property="UpdatePip" Value='"[PYTHON_EXE]" -m ensurepip -U --default-pip' Execute="immediate" />
|
||||
<CustomAction Id="SetRemovePipCommandLine" Property="UpdatePip" Value='"[PYTHON_EXE]" -B -m ensurepip._uninstall' Execute="immediate" />
|
||||
<CustomAction Id="SetUpdatePipCommandLine" Property="UpdatePip" Value='"[PYTHON_EXE]" -E -s -m ensurepip -U --default-pip' Execute="immediate" />
|
||||
<CustomAction Id="SetRemovePipCommandLine" Property="UpdatePip" Value='"[PYTHON_EXE]" -E -s -B -m ensurepip._uninstall' Execute="immediate" />
|
||||
|
||||
<InstallExecuteSequence>
|
||||
<Custom Action="SetUpdatePipCommandLine" Before="UpdatePip">(&DefaultFeature=3) AND NOT (!DefaultFeature=3)</Custom>
|
||||
|
|
|
|||
Loading…
Reference in New Issue