Mailman 3 June 2019 - Python-checkins

bpo-26219: per opcode cache for LOAD_GLOBAL (GH-12884)
by Inada Naoki 03 Jun '19

03 Jun '19

https://github.com/python/cpython/commit/91234a16367b56ca03ee289f7c03a34d4c… commit: 91234a16367b56ca03ee289f7c03a34d4cfec4c8 branch: master author: Inada Naoki <songofacandy(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2019-06-03T21:30:58+09:00 summary: bpo-26219: per opcode cache for LOAD_GLOBAL (GH-12884) This patch implements per opcode cache mechanism, and use it in only LOAD_GLOBAL opcode. Based on Yury's opcache3.patch in bpo-26219. files: A Include/internal/pycore_code.h A Misc/NEWS.d/next/Core and Builtins/2019-05-29-22-03-09.bpo-26219.Ovf1Qs.rst M Doc/whatsnew/3.8.rst M Include/code.h M Include/internal/pycore_ceval.h M Lib/test/test_dict_version.py M Makefile.pre.in M Objects/codeobject.c M Objects/dictobject.c M PCbuild/pythoncore.vcxproj M PCbuild/pythoncore.vcxproj.filters M Python/ceval.c M Python/pylifecycle.c diff --git a/Doc/whatsnew/3.8.rst b/Doc/whatsnew/3.8.rst index 9474a2f4aafe..da97a7285099 100644 --- a/Doc/whatsnew/3.8.rst +++ b/Doc/whatsnew/3.8.rst @@ -860,6 +860,10 @@ Optimizations methods up to 20--50%. (Contributed by Serhiy Storchaka in :issue:`23867`, :issue:`35582` and :issue:`36127`.) +* ``LOAD_GLOBAL`` instruction now uses new "per opcode cache" mechanism. + It is about 40% faster now. (Contributed by Yury Selivanov and Inada Naoki in + :issue:`26219`.) + Build and C API Changes ======================= diff --git a/Include/code.h b/Include/code.h index 933de97d0782..b79d977394e0 100644 --- a/Include/code.h +++ b/Include/code.h @@ -17,6 +17,8 @@ typedef uint16_t _Py_CODEUNIT; # define _Py_OPARG(word) ((word) >> 8) #endif +typedef struct _PyOpcache _PyOpcache; + /* Bytecode object */ typedef struct { PyObject_HEAD @@ -49,6 +51,21 @@ typedef struct { Type is a void* to keep the format private in codeobject.c to force people to go through the proper APIs. */ void *co_extra; + + /* Per opcodes just-in-time cache + * + * To reduce cache size, we use indirect mapping from opcode index to + * cache object: + * cache = co_opcache[co_opcache_map[next_instr - first_instr] - 1] + */ + + // co_opcache_map is indexed by (next_instr - first_instr). + // * 0 means there is no cache for this opcode. + // * n > 0 means there is cache in co_opcache[n-1]. + unsigned char *co_opcache_map; + _PyOpcache *co_opcache; + int co_opcache_flag; // used to determine when create a cache. + unsigned char co_opcache_size; // length of co_opcache. } PyCodeObject; /* Masks for co_flags above */ diff --git a/Include/internal/pycore_ceval.h b/Include/internal/pycore_ceval.h index d44afdf4fa46..2c6df9a9af9e 100644 --- a/Include/internal/pycore_ceval.h +++ b/Include/internal/pycore_ceval.h @@ -31,6 +31,9 @@ PyAPI_FUNC(void) _PyEval_SignalAsyncExc( PyAPI_FUNC(void) _PyEval_ReInitThreads( _PyRuntimeState *runtime); +/* Private function */ +void _PyEval_Fini(void); + #ifdef __cplusplus } #endif diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h new file mode 100644 index 000000000000..88956f109b4f --- /dev/null +++ b/Include/internal/pycore_code.h @@ -0,0 +1,27 @@ +#ifndef Py_INTERNAL_CODE_H +#define Py_INTERNAL_CODE_H +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct { + PyObject *ptr; /* Cached pointer (borrowed reference) */ + uint64_t globals_ver; /* ma_version of global dict */ + uint64_t builtins_ver; /* ma_version of builtin dict */ +} _PyOpcache_LoadGlobal; + +struct _PyOpcache { + union { + _PyOpcache_LoadGlobal lg; + } u; + char optimized; +}; + +/* Private API */ +int _PyCode_InitOpcache(PyCodeObject *co); + + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_CODE_H */ diff --git a/Lib/test/test_dict_version.py b/Lib/test/test_dict_version.py index 5671f9fc7c22..cb79e7434c29 100644 --- a/Lib/test/test_dict_version.py +++ b/Lib/test/test_dict_version.py @@ -80,14 +80,14 @@ def test_setitem_same_value(self): # setting a key to the same value with dict.__setitem__ # must change the version - self.check_version_changed(d, d.__setitem__, 'key', value) + self.check_version_dont_change(d, d.__setitem__, 'key', value) # setting a key to the same value with dict.update # must change the version - self.check_version_changed(d, d.update, key=value) + self.check_version_dont_change(d, d.update, key=value) d2 = self.new_dict(key=value) - self.check_version_changed(d, d.update, d2) + self.check_version_dont_change(d, d.update, d2) def test_setitem_equal(self): class AlwaysEqual: diff --git a/Makefile.pre.in b/Makefile.pre.in index 0bf5df4b68e5..a0bc9c1f1cc8 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1070,6 +1070,7 @@ PYTHON_HEADERS= \ $(srcdir)/Include/internal/pycore_accu.h \ $(srcdir)/Include/internal/pycore_atomic.h \ $(srcdir)/Include/internal/pycore_ceval.h \ + $(srcdir)/Include/internal/pycore_code.h \ $(srcdir)/Include/internal/pycore_condvar.h \ $(srcdir)/Include/internal/pycore_context.h \ $(srcdir)/Include/internal/pycore_fileutils.h \ diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-05-29-22-03-09.bpo-26219.Ovf1Qs.rst b/Misc/NEWS.d/next/Core and Builtins/2019-05-29-22-03-09.bpo-26219.Ovf1Qs.rst new file mode 100644 index 000000000000..a4ee7b580bc8 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2019-05-29-22-03-09.bpo-26219.Ovf1Qs.rst @@ -0,0 +1,3 @@ +Implemented per opcode cache mechanism and ``LOAD_GLOBAL`` instruction use +it. ``LOAD_GLOBAL`` is now about 40% faster. Contributed by Yury Selivanov, +and Inada Naoki. diff --git a/Objects/codeobject.c b/Objects/codeobject.c index 233307562a55..0d9e5d16e768 100644 --- a/Objects/codeobject.c +++ b/Objects/codeobject.c @@ -2,7 +2,9 @@ #include "Python.h" #include "code.h" +#include "opcode.h" #include "structmember.h" +#include "pycore_code.h" #include "pycore_pystate.h" #include "pycore_tupleobject.h" #include "clinic/codeobject.c.h" @@ -233,9 +235,56 @@ PyCode_New(int argcount, int posonlyargcount, int kwonlyargcount, co->co_zombieframe = NULL; co->co_weakreflist = NULL; co->co_extra = NULL; + + co->co_opcache_map = NULL; + co->co_opcache = NULL; + co->co_opcache_flag = 0; + co->co_opcache_size = 0; return co; } +int +_PyCode_InitOpcache(PyCodeObject *co) +{ + Py_ssize_t co_size = PyBytes_Size(co->co_code) / sizeof(_Py_CODEUNIT); + co->co_opcache_map = (unsigned char *)PyMem_Calloc(co_size, 1); + if (co->co_opcache_map == NULL) { + return -1; + } + + _Py_CODEUNIT *opcodes = (_Py_CODEUNIT*)PyBytes_AS_STRING(co->co_code); + Py_ssize_t opts = 0; + + for (Py_ssize_t i = 0; i < co_size;) { + unsigned char opcode = _Py_OPCODE(opcodes[i]); + i++; // 'i' is now aligned to (next_instr - first_instr) + + // TODO: LOAD_METHOD, LOAD_ATTR + if (opcode == LOAD_GLOBAL) { + co->co_opcache_map[i] = ++opts; + if (opts > 254) { + break; + } + } + } + + if (opts) { + co->co_opcache = (_PyOpcache *)PyMem_Calloc(opts, sizeof(_PyOpcache)); + if (co->co_opcache == NULL) { + PyMem_FREE(co->co_opcache_map); + return -1; + } + } + else { + PyMem_FREE(co->co_opcache_map); + co->co_opcache_map = NULL; + co->co_opcache = NULL; + } + + co->co_opcache_size = opts; + return 0; +} + PyCodeObject * PyCode_NewEmpty(const char *filename, const char *funcname, int firstlineno) { @@ -458,6 +507,15 @@ code_new(PyTypeObject *type, PyObject *args, PyObject *kw) static void code_dealloc(PyCodeObject *co) { + if (co->co_opcache != NULL) { + PyMem_FREE(co->co_opcache); + } + if (co->co_opcache_map != NULL) { + PyMem_FREE(co->co_opcache_map); + } + co->co_opcache_flag = 0; + co->co_opcache_size = 0; + if (co->co_extra != NULL) { PyInterpreterState *interp = _PyInterpreterState_GET_UNSAFE(); _PyCodeObjectExtra *co_extra = co->co_extra; @@ -504,6 +562,13 @@ code_sizeof(PyCodeObject *co, PyObject *Py_UNUSED(args)) res += sizeof(_PyCodeObjectExtra) + (co_extra->ce_size-1) * sizeof(co_extra->ce_extras[0]); } + if (co->co_opcache != NULL) { + assert(co->co_opcache_map != NULL); + // co_opcache_map + res += PyBytes_GET_SIZE(co->co_code) / sizeof(_Py_CODEUNIT); + // co_opcache + res += co->co_opcache_size * sizeof(_PyOpcache); + } return PyLong_FromSsize_t(res); } diff --git a/Objects/dictobject.c b/Objects/dictobject.c index 2b04b0b67965..0cc144375006 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -1080,20 +1080,21 @@ insertdict(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject *value) return 0; } - if (_PyDict_HasSplitTable(mp)) { - mp->ma_values[ix] = value; - if (old_value == NULL) { - /* pending state */ - assert(ix == mp->ma_used); - mp->ma_used++; + if (old_value != value) { + if (_PyDict_HasSplitTable(mp)) { + mp->ma_values[ix] = value; + if (old_value == NULL) { + /* pending state */ + assert(ix == mp->ma_used); + mp->ma_used++; + } } + else { + assert(old_value != NULL); + DK_ENTRIES(mp->ma_keys)[ix].me_value = value; + } + mp->ma_version_tag = DICT_NEXT_VERSION(); } - else { - assert(old_value != NULL); - DK_ENTRIES(mp->ma_keys)[ix].me_value = value; - } - - mp->ma_version_tag = DICT_NEXT_VERSION(); Py_XDECREF(old_value); /* which **CAN** re-enter (see issue #22653) */ ASSERT_CONSISTENT(mp); Py_DECREF(key); diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj index 329f9feb2bdf..89625da944e1 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -158,6 +158,7 @@ <ClInclude Include="..\Include\import.h" /> <ClInclude Include="..\Include\internal\pycore_accu.h" /> <ClInclude Include="..\Include\internal\pycore_atomic.h" /> + <ClInclude Include="..\Include\internal\pycore_code.h" /> <ClInclude Include="..\Include\internal\pycore_ceval.h" /> <ClInclude Include="..\Include\internal\pycore_condvar.h" /> <ClInclude Include="..\Include\internal\pycore_context.h" /> diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters index d80d05fb15a0..63ab88b4a01d 100644 --- a/PCbuild/pythoncore.vcxproj.filters +++ b/PCbuild/pythoncore.vcxproj.filters @@ -177,6 +177,9 @@ <ClInclude Include="..\Include\internal\pycore_atomic.h"> <Filter>Include</Filter> </ClInclude> + <ClInclude Include="..\Include\internal\pycore_code.h"> + <Filter>Include</Filter> + </ClInclude> <ClInclude Include="..\Include\internal\pycore_ceval.h"> <Filter>Include</Filter> </ClInclude> diff --git a/Python/ceval.c b/Python/ceval.c index a092a2355641..411ba3d73c5f 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -11,6 +11,7 @@ #include "Python.h" #include "pycore_ceval.h" +#include "pycore_code.h" #include "pycore_object.h" #include "pycore_pyerrors.h" #include "pycore_pylifecycle.h" @@ -101,6 +102,20 @@ static long dxp[256]; #endif #endif +/* per opcode cache */ +#define OPCACHE_MIN_RUNS 1024 /* create opcache when code executed this time */ +#define OPCACHE_STATS 0 /* Enable stats */ + +#if OPCACHE_STATS +static size_t opcache_code_objects = 0; +static size_t opcache_code_objects_extra_mem = 0; + +static size_t opcache_global_opts = 0; +static size_t opcache_global_hits = 0; +static size_t opcache_global_misses = 0; +#endif + + /* This can set eval_breaker to 0 even though gil_drop_request became 1. We believe this is all right because the eval loop will release the GIL eventually anyway. */ @@ -225,6 +240,35 @@ exit_thread_if_finalizing(PyThreadState *tstate) } } +void +_PyEval_Fini(void) +{ +#if OPCACHE_STATS + fprintf(stderr, "-- Opcode cache number of objects = %zd\n", + opcache_code_objects); + + fprintf(stderr, "-- Opcode cache total extra mem = %zd\n", + opcache_code_objects_extra_mem); + + fprintf(stderr, "\n"); + + fprintf(stderr, "-- Opcode cache LOAD_GLOBAL hits = %zd (%d%%)\n", + opcache_global_hits, + (int) (100.0 * opcache_global_hits / + (opcache_global_hits + opcache_global_misses))); + + fprintf(stderr, "-- Opcode cache LOAD_GLOBAL misses = %zd (%d%%)\n", + opcache_global_misses, + (int) (100.0 * opcache_global_misses / + (opcache_global_hits + opcache_global_misses))); + + fprintf(stderr, "-- Opcode cache LOAD_GLOBAL opts = %zd\n", + opcache_global_opts); + + fprintf(stderr, "\n"); +#endif +} + void PyEval_AcquireLock(void) { @@ -799,6 +843,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag) const _Py_CODEUNIT *first_instr; PyObject *names; PyObject *consts; + _PyOpcache *co_opcache; #ifdef LLTRACE _Py_IDENTIFIER(__ltrace__); @@ -1061,6 +1106,49 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag) Py_XDECREF(traceback); \ } while(0) + /* macros for opcode cache */ +#define OPCACHE_CHECK() \ + do { \ + co_opcache = NULL; \ + if (co->co_opcache != NULL) { \ + unsigned char co_opt_offset = \ + co->co_opcache_map[next_instr - first_instr]; \ + if (co_opt_offset > 0) { \ + assert(co_opt_offset <= co->co_opcache_size); \ + co_opcache = &co->co_opcache[co_opt_offset - 1]; \ + assert(co_opcache != NULL); \ + if (co_opcache->optimized < 0) { \ + co_opcache = NULL; \ + } \ + } \ + } \ + } while (0) + +#if OPCACHE_STATS + +#define OPCACHE_STAT_GLOBAL_HIT() \ + do { \ + if (co->co_opcache != NULL) opcache_global_hits++; \ + } while (0) + +#define OPCACHE_STAT_GLOBAL_MISS() \ + do { \ + if (co->co_opcache != NULL) opcache_global_misses++; \ + } while (0) + +#define OPCACHE_STAT_GLOBAL_OPT() \ + do { \ + if (co->co_opcache != NULL) opcache_global_opts++; \ + } while (0) + +#else /* OPCACHE_STATS */ + +#define OPCACHE_STAT_GLOBAL_HIT() +#define OPCACHE_STAT_GLOBAL_MISS() +#define OPCACHE_STAT_GLOBAL_OPT() + +#endif + /* Start of code */ /* push frame */ @@ -1142,6 +1230,20 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag) f->f_stacktop = NULL; /* remains NULL unless yield suspends frame */ f->f_executing = 1; + if (co->co_opcache_flag < OPCACHE_MIN_RUNS) { + co->co_opcache_flag++; + if (co->co_opcache_flag == OPCACHE_MIN_RUNS) { + if (_PyCode_InitOpcache(co) < 0) { + return NULL; + } +#if OPCACHE_STATS + opcache_code_objects_extra_mem += + PyBytes_Size(co->co_code) / sizeof(_Py_CODEUNIT) + + sizeof(_PyOpcache) * co->co_opcache_size; + opcache_code_objects++; +#endif + } + } #ifdef LLTRACE lltrace = _PyDict_GetItemId(f->f_globals, &PyId___ltrace__) != NULL; @@ -2451,11 +2553,30 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag) } case TARGET(LOAD_GLOBAL): { - PyObject *name = GETITEM(names, oparg); + PyObject *name; PyObject *v; if (PyDict_CheckExact(f->f_globals) && PyDict_CheckExact(f->f_builtins)) { + OPCACHE_CHECK(); + if (co_opcache != NULL && co_opcache->optimized > 0) { + _PyOpcache_LoadGlobal *lg = &co_opcache->u.lg; + + if (lg->globals_ver == + ((PyDictObject *)f->f_globals)->ma_version_tag + && lg->builtins_ver == + ((PyDictObject *)f->f_builtins)->ma_version_tag) + { + PyObject *ptr = lg->ptr; + OPCACHE_STAT_GLOBAL_HIT(); + assert(ptr != NULL); + Py_INCREF(ptr); + PUSH(ptr); + DISPATCH(); + } + } + + name = GETITEM(names, oparg); v = _PyDict_LoadGlobal((PyDictObject *)f->f_globals, (PyDictObject *)f->f_builtins, name); @@ -2468,12 +2589,32 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag) } goto error; } + + if (co_opcache != NULL) { + _PyOpcache_LoadGlobal *lg = &co_opcache->u.lg; + + if (co_opcache->optimized == 0) { + /* Wasn't optimized before. */ + OPCACHE_STAT_GLOBAL_OPT(); + } else { + OPCACHE_STAT_GLOBAL_MISS(); + } + + co_opcache->optimized = 1; + lg->globals_ver = + ((PyDictObject *)f->f_globals)->ma_version_tag; + lg->builtins_ver = + ((PyDictObject *)f->f_builtins)->ma_version_tag; + lg->ptr = v; /* borrowed */ + } + Py_INCREF(v); } else { /* Slow-path if globals or builtins is not a dict */ /* namespace 1: globals */ + name = GETITEM(names, oparg); v = PyObject_GetItem(f->f_globals, name); if (v == NULL) { if (!_PyErr_ExceptionMatches(tstate, PyExc_KeyError)) { diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 3de5528811ae..fc7e5510b2cd 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -1242,6 +1242,9 @@ Py_FinalizeEx(void) /* Destroy all modules */ PyImport_Cleanup(); + /* Print debug stats if any */ + _PyEval_Fini(); + /* Flush sys.stdout and sys.stderr (again, in case more was printed) */ if (flush_std_files() < 0) { status = -1;

1 0

Pin macOS installer Sphinx to v2.0.1 (GH-13774)
by Ned Deily 03 Jun '19

03 Jun '19

https://github.com/python/cpython/commit/29ec4228106ed5f970d1c3666614f4a51b… commit: 29ec4228106ed5f970d1c3666614f4a51bad192c branch: master author: Ned Deily <nad(a)python.org> committer: GitHub <noreply(a)github.com> date: 2019-06-03T08:00:25-04:00 summary: Pin macOS installer Sphinx to v2.0.1 (GH-13774) files: M Mac/BuildScript/build-installer.py diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 60e28fee055d..2c606b9df674 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -1058,6 +1058,7 @@ def buildPythonDocs(): runCommand('make clean') # Create virtual environment for docs builds with blurb and sphinx runCommand('make venv') + runCommand('venv/bin/python3 -m pip install -U Sphinx==2.0.1') runCommand('make html PYTHON=venv/bin/python') os.chdir(curDir) if not os.path.exists(docdir):

1 0

bpo-36231: Support building on macOS without /usr/include (GH-13773)
by Ned Deily 03 Jun '19

03 Jun '19

https://github.com/python/cpython/commit/0288dd6a5192074fcd5aa0db5d3513c388… commit: 0288dd6a5192074fcd5aa0db5d3513c3880209ca branch: master author: Ned Deily <nad(a)python.org> committer: GitHub <noreply(a)github.com> date: 2019-06-03T06:34:48-04:00 summary: bpo-36231: Support building on macOS without /usr/include (GH-13773) files: A Misc/NEWS.d/next/macOS/2019-06-03-05-49-49.bpo-36231.RfmW_p.rst M setup.py diff --git a/Misc/NEWS.d/next/macOS/2019-06-03-05-49-49.bpo-36231.RfmW_p.rst b/Misc/NEWS.d/next/macOS/2019-06-03-05-49-49.bpo-36231.RfmW_p.rst new file mode 100644 index 000000000000..c82e54c12c89 --- /dev/null +++ b/Misc/NEWS.d/next/macOS/2019-06-03-05-49-49.bpo-36231.RfmW_p.rst @@ -0,0 +1,3 @@ +Support building Python on macOS without /usr/include installed. As of macOS +10.14, system header files are only available within an SDK provided by +either the Command Line Tools or the Xcode app. diff --git a/setup.py b/setup.py index 7852c2dfa27e..598f5819f8f3 100644 --- a/setup.py +++ b/setup.py @@ -125,19 +125,57 @@ def sysroot_paths(make_vars, subdirs): break return dirs +MACOS_SDK_ROOT = None def macosx_sdk_root(): + """Return the directory of the current macOS SDK. + + If no SDK was explicitly configured, call the compiler to find which + include files paths are being searched by default. Use '/' if the + compiler is searching /usr/include (meaning system header files are + installed) or use the root of an SDK if that is being searched. + (The SDK may be supplied via Xcode or via the Command Line Tools). + The SDK paths used by Apple-supplied tool chains depend on the + setting of various variables; see the xcrun man page for more info. """ - Return the directory of the current OSX SDK, - or '/' if no SDK was specified. - """ + global MACOS_SDK_ROOT + + # If already called, return cached result. + if MACOS_SDK_ROOT: + return MACOS_SDK_ROOT + cflags = sysconfig.get_config_var('CFLAGS') m = re.search(r'-isysroot\s+(\S+)', cflags) - if m is None: - sysroot = '/' + if m is not None: + MACOS_SDK_ROOT = m.group(1) else: - sysroot = m.group(1) - return sysroot + MACOS_SDK_ROOT = '/' + cc = sysconfig.get_config_var('CC') + tmpfile = '/tmp/setup_sdk_root.%d' % os.getpid() + try: + os.unlink(tmpfile) + except: + pass + ret = os.system('%s -E -v - </dev/null 2>%s 1>/dev/null' % (cc, tmpfile)) + in_incdirs = False + try: + if ret >> 8 == 0: + with open(tmpfile) as fp: + for line in fp.readlines(): + if line.startswith("#include <...>"): + in_incdirs = True + elif line.startswith("End of search list"): + in_incdirs = False + elif in_incdirs: + line = line.strip() + if line == '/usr/include': + MACOS_SDK_ROOT = '/' + elif line.endswith(".sdk/usr/include"): + MACOS_SDK_ROOT = line[:-12] + finally: + os.unlink(tmpfile) + + return MACOS_SDK_ROOT def is_macosx_sdk_path(path):

1 0

bpo-35814: Allow unpacking in r.h.s of annotated assignment expressions (GH-13760)
by Pablo Galindo 03 Jun '19

03 Jun '19

https://github.com/python/cpython/commit/8565f6b6db0fa9f65449b532a5056a98ba… commit: 8565f6b6db0fa9f65449b532a5056a98bad3dc37 branch: master author: Pablo Galindo <Pablogsal(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2019-06-03T08:34:20+01:00 summary: bpo-35814: Allow unpacking in r.h.s of annotated assignment expressions (GH-13760) files: A Misc/NEWS.d/next/Core and Builtins/2019-06-03-00-51-02.bpo-35814.Cf7sGY.rst M Grammar/Grammar M Lib/test/test_grammar.py M Python/ast.c M Python/graminit.c diff --git a/Grammar/Grammar b/Grammar/Grammar index 0cacfb648e9a..21f7e1a89115 100644 --- a/Grammar/Grammar +++ b/Grammar/Grammar @@ -84,7 +84,7 @@ small_stmt: (expr_stmt | del_stmt | pass_stmt | flow_stmt | import_stmt | global_stmt | nonlocal_stmt | assert_stmt) expr_stmt: testlist_star_expr (annassign | augassign (yield_expr|testlist) | [('=' (yield_expr|testlist_star_expr))+ [TYPE_COMMENT]] ) -annassign: ':' test ['=' (yield_expr|testlist)] +annassign: ':' test ['=' (yield_expr|testlist_star_expr)] testlist_star_expr: (test|star_expr) (',' (test|star_expr))* [','] augassign: ('+=' | '-=' | '*=' | '@=' | '/=' | '%=' | '&=' | '|=' | '^=' | '<<=' | '>>=' | '**=' | '//=') diff --git a/Lib/test/test_grammar.py b/Lib/test/test_grammar.py index 2a3b71fac4a5..78d94593c7f3 100644 --- a/Lib/test/test_grammar.py +++ b/Lib/test/test_grammar.py @@ -454,6 +454,10 @@ def test_var_annot_rhs(self): exec(stmt, ns) self.assertEqual(list(ns['f']()), [None]) + ns = {"a": 1, 'b': (2, 3, 4), "c":5, "Tuple": typing.Tuple} + exec('x: Tuple[int, ...] = a,*b,c', ns) + self.assertEqual(ns['x'], (1, 2, 3, 4, 5)) + def test_funcdef(self): ### [decorators] 'def' NAME parameters ['->' test] ':' suite ### decorator: '@' dotted_name [ '(' [arglist] ')' ] NEWLINE diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-06-03-00-51-02.bpo-35814.Cf7sGY.rst b/Misc/NEWS.d/next/Core and Builtins/2019-06-03-00-51-02.bpo-35814.Cf7sGY.rst new file mode 100644 index 000000000000..2b9f00a6d9e7 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2019-06-03-00-51-02.bpo-35814.Cf7sGY.rst @@ -0,0 +1,2 @@ +Allow unpacking in the right hand side of annotated assignments. In +particular, ``t: Tuple[int, ...] = x, y, *z`` is now allowed. diff --git a/Python/ast.c b/Python/ast.c index b77552274d24..df9242977e3f 100644 --- a/Python/ast.c +++ b/Python/ast.c @@ -3398,7 +3398,7 @@ ast_for_expr_stmt(struct compiling *c, const node *n) } else { ch = CHILD(ann, 3); - if (TYPE(ch) == testlist) { + if (TYPE(ch) == testlist_star_expr) { expr3 = ast_for_testlist(c, ch); } else { diff --git a/Python/graminit.c b/Python/graminit.c index 0587b1c0fc10..7c40ce933c1d 100644 --- a/Python/graminit.c +++ b/Python/graminit.c @@ -742,7 +742,7 @@ static const arc arcs_17_2[2] = { {0, 2}, }; static const arc arcs_17_3[2] = { - {47, 4}, + {81, 4}, {84, 4}, }; static const arc arcs_17_4[1] = {

1 0

IDLE: Fix typos in docs and comments (GH-13749)
by Miss Islington (bot) 03 Jun '19

03 Jun '19

https://github.com/python/cpython/commit/ab4d42a33e204026cc3eb3a15de54a14f2… commit: ab4d42a33e204026cc3eb3a15de54a14f224fdbb branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-06-02T21:39:32-07:00 summary: IDLE: Fix typos in docs and comments (GH-13749) (cherry picked from commit d9677f36fe486e86bb86f2cd59cb7fc3804bdac1) Co-authored-by: Xtreak <tir.karthi(a)gmail.com> files: M Lib/idlelib/config.py M Lib/idlelib/configdialog.py M Lib/idlelib/delegator.py M Lib/idlelib/editor.py M Lib/idlelib/idle_test/htest.py M Lib/idlelib/idle_test/mock_tk.py M Lib/idlelib/idle_test/test_pyparse.py M Lib/idlelib/search.py M Lib/idlelib/searchbase.py M Lib/idlelib/squeezer.py M Lib/idlelib/undo.py diff --git a/Lib/idlelib/config.py b/Lib/idlelib/config.py index aa94d6535be6..12113c19c086 100644 --- a/Lib/idlelib/config.py +++ b/Lib/idlelib/config.py @@ -12,7 +12,7 @@ there are separate dicts for default and user values. Each has config-type keys 'main', 'extensions', 'highlight', and 'keys'. The value for each key is a ConfigParser instance that maps section and item -to values. For 'main' and 'extenstons', user values override +to values. For 'main' and 'extensions', user values override default values. For 'highlight' and 'keys', user sections augment the default sections (and must, therefore, have distinct names). diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py index 4aaec1321f7d..807ff60413d1 100644 --- a/Lib/idlelib/configdialog.py +++ b/Lib/idlelib/configdialog.py @@ -199,7 +199,7 @@ def destroy(self): def help(self): """Create textview for config dialog help. - Attrbutes accessed: + Attributes accessed: note Methods: diff --git a/Lib/idlelib/delegator.py b/Lib/idlelib/delegator.py index dc2a1aaeeab7..55c95da8532f 100644 --- a/Lib/idlelib/delegator.py +++ b/Lib/idlelib/delegator.py @@ -14,7 +14,7 @@ def __getattr__(self, name): def resetcache(self): "Removes added attributes while leaving original attributes." - # Function is really about resetting delagator dict + # Function is really about resetting delegator dict # to original state. Cache is just a means for key in self.__cache: try: diff --git a/Lib/idlelib/editor.py b/Lib/idlelib/editor.py index 89b7239a96ea..a6674728cd93 100644 --- a/Lib/idlelib/editor.py +++ b/Lib/idlelib/editor.py @@ -315,7 +315,7 @@ def __init__(self, flist=None, filename=None, key=None, root=None): self.CodeContext(self).toggle_code_context_event) def _filename_to_unicode(self, filename): - """Return filename as BMP unicode so diplayable in Tk.""" + """Return filename as BMP unicode so displayable in Tk.""" # Decode bytes to unicode. if isinstance(filename, bytes): try: diff --git a/Lib/idlelib/idle_test/htest.py b/Lib/idlelib/idle_test/htest.py index 429081f7ef25..6e3398ed0bc8 100644 --- a/Lib/idlelib/idle_test/htest.py +++ b/Lib/idlelib/idle_test/htest.py @@ -12,7 +12,7 @@ The first parameter of X must be 'parent'. When called, the parent argument will be the root window. X must create a child Toplevel window (or subclass thereof). The Toplevel may be a test widget or -dialog, in which case the callable is the corresonding class. Or the +dialog, in which case the callable is the corresponding class. Or the Toplevel may contain the widget to be tested or set up a context in which a test widget is invoked. In this latter case, the callable is a wrapper function that sets up the Toplevel and other objects. Wrapper diff --git a/Lib/idlelib/idle_test/mock_tk.py b/Lib/idlelib/idle_test/mock_tk.py index a54f51f1949c..576f7d5d609e 100644 --- a/Lib/idlelib/idle_test/mock_tk.py +++ b/Lib/idlelib/idle_test/mock_tk.py @@ -37,7 +37,7 @@ class Mbox_func: """Generic mock for messagebox functions, which all have the same signature. Instead of displaying a message box, the mock's call method saves the - arguments as instance attributes, which test functions can then examime. + arguments as instance attributes, which test functions can then examine. The test can set the result returned to ask function """ def __init__(self, result=None): diff --git a/Lib/idlelib/idle_test/test_pyparse.py b/Lib/idlelib/idle_test/test_pyparse.py index 0534301b3610..479b84a216b0 100644 --- a/Lib/idlelib/idle_test/test_pyparse.py +++ b/Lib/idlelib/idle_test/test_pyparse.py @@ -160,7 +160,7 @@ def test_study1(self): TestInfo('\n def function1(self, a,\n', [0, 1, 2], BRACKET), TestInfo('())\n', [0, 1], NONE), # Extra closer. TestInfo(')(\n', [0, 1], BRACKET), # Extra closer. - # For the mismatched example, it doesn't look like contination. + # For the mismatched example, it doesn't look like continuation. TestInfo('{)(]\n', [0, 1], NONE), # Mismatched. ) diff --git a/Lib/idlelib/search.py b/Lib/idlelib/search.py index 5bbe9d6b5dc8..b35f3b59c3d2 100644 --- a/Lib/idlelib/search.py +++ b/Lib/idlelib/search.py @@ -80,7 +80,7 @@ def find_again(self, text): If no search was previously run, open a new search dialog. In this case, no search is done. - If a seach was previously run, the search dialog won't be + If a search was previously run, the search dialog won't be shown and the options from the previous search (including the search pattern) will be used to find the next occurrence of the pattern. Next is relative based on direction. diff --git a/Lib/idlelib/searchbase.py b/Lib/idlelib/searchbase.py index 74ba8538512b..4ed94f186b04 100644 --- a/Lib/idlelib/searchbase.py +++ b/Lib/idlelib/searchbase.py @@ -36,7 +36,7 @@ def __init__(self, root, engine): text (Text searched): set in open(), only used in subclasses(). ent (ry): created in make_entry() called from create_entry(). row (of grid): 0 in create_widgets(), +1 in make_entry/frame(). - default_command: set in subclasses, used in create_widgers(). + default_command: set in subclasses, used in create_widgets(). title (of dialog): class attribute, override in subclasses. icon (of dialog): ditto, use unclear if cannot minimize dialog. diff --git a/Lib/idlelib/squeezer.py b/Lib/idlelib/squeezer.py index 869498d753a2..032401f2abc7 100644 --- a/Lib/idlelib/squeezer.py +++ b/Lib/idlelib/squeezer.py @@ -6,7 +6,7 @@ completely unusable. This extension will automatically replace long texts with a small button. -Double-cliking this button will remove it and insert the original text instead. +Double-clicking this button will remove it and insert the original text instead. Middle-clicking will copy the text to the clipboard. Right-clicking will open the text in a separate viewing window. diff --git a/Lib/idlelib/undo.py b/Lib/idlelib/undo.py index f048994b7d15..85ecffecb4cb 100644 --- a/Lib/idlelib/undo.py +++ b/Lib/idlelib/undo.py @@ -2,7 +2,7 @@ from idlelib.delegator import Delegator -# tkintter import not needed because module does not create widgets, +# tkinter import not needed because module does not create widgets, # although many methods operate on text widget arguments. #$ event <<redo>>

1 0

IDLE: Fix typos in docs and comments (GH-13749)
by Terry Jan Reedy 03 Jun '19

03 Jun '19

https://github.com/python/cpython/commit/d9677f36fe486e86bb86f2cd59cb7fc380… commit: d9677f36fe486e86bb86f2cd59cb7fc3804bdac1 branch: master author: Xtreak <tir.karthi(a)gmail.com> committer: Terry Jan Reedy <tjreedy(a)udel.edu> date: 2019-06-03T00:21:15-04:00 summary: IDLE: Fix typos in docs and comments (GH-13749) files: M Lib/idlelib/config.py M Lib/idlelib/configdialog.py M Lib/idlelib/delegator.py M Lib/idlelib/editor.py M Lib/idlelib/idle_test/htest.py M Lib/idlelib/idle_test/mock_tk.py M Lib/idlelib/idle_test/test_pyparse.py M Lib/idlelib/search.py M Lib/idlelib/searchbase.py M Lib/idlelib/squeezer.py M Lib/idlelib/undo.py diff --git a/Lib/idlelib/config.py b/Lib/idlelib/config.py index aa94d6535be6..12113c19c086 100644 --- a/Lib/idlelib/config.py +++ b/Lib/idlelib/config.py @@ -12,7 +12,7 @@ there are separate dicts for default and user values. Each has config-type keys 'main', 'extensions', 'highlight', and 'keys'. The value for each key is a ConfigParser instance that maps section and item -to values. For 'main' and 'extenstons', user values override +to values. For 'main' and 'extensions', user values override default values. For 'highlight' and 'keys', user sections augment the default sections (and must, therefore, have distinct names). diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py index 4aaec1321f7d..807ff60413d1 100644 --- a/Lib/idlelib/configdialog.py +++ b/Lib/idlelib/configdialog.py @@ -199,7 +199,7 @@ def destroy(self): def help(self): """Create textview for config dialog help. - Attrbutes accessed: + Attributes accessed: note Methods: diff --git a/Lib/idlelib/delegator.py b/Lib/idlelib/delegator.py index dc2a1aaeeab7..55c95da8532f 100644 --- a/Lib/idlelib/delegator.py +++ b/Lib/idlelib/delegator.py @@ -14,7 +14,7 @@ def __getattr__(self, name): def resetcache(self): "Removes added attributes while leaving original attributes." - # Function is really about resetting delagator dict + # Function is really about resetting delegator dict # to original state. Cache is just a means for key in self.__cache: try: diff --git a/Lib/idlelib/editor.py b/Lib/idlelib/editor.py index 89b7239a96ea..a6674728cd93 100644 --- a/Lib/idlelib/editor.py +++ b/Lib/idlelib/editor.py @@ -315,7 +315,7 @@ def __init__(self, flist=None, filename=None, key=None, root=None): self.CodeContext(self).toggle_code_context_event) def _filename_to_unicode(self, filename): - """Return filename as BMP unicode so diplayable in Tk.""" + """Return filename as BMP unicode so displayable in Tk.""" # Decode bytes to unicode. if isinstance(filename, bytes): try: diff --git a/Lib/idlelib/idle_test/htest.py b/Lib/idlelib/idle_test/htest.py index 429081f7ef25..6e3398ed0bc8 100644 --- a/Lib/idlelib/idle_test/htest.py +++ b/Lib/idlelib/idle_test/htest.py @@ -12,7 +12,7 @@ The first parameter of X must be 'parent'. When called, the parent argument will be the root window. X must create a child Toplevel window (or subclass thereof). The Toplevel may be a test widget or -dialog, in which case the callable is the corresonding class. Or the +dialog, in which case the callable is the corresponding class. Or the Toplevel may contain the widget to be tested or set up a context in which a test widget is invoked. In this latter case, the callable is a wrapper function that sets up the Toplevel and other objects. Wrapper diff --git a/Lib/idlelib/idle_test/mock_tk.py b/Lib/idlelib/idle_test/mock_tk.py index a54f51f1949c..576f7d5d609e 100644 --- a/Lib/idlelib/idle_test/mock_tk.py +++ b/Lib/idlelib/idle_test/mock_tk.py @@ -37,7 +37,7 @@ class Mbox_func: """Generic mock for messagebox functions, which all have the same signature. Instead of displaying a message box, the mock's call method saves the - arguments as instance attributes, which test functions can then examime. + arguments as instance attributes, which test functions can then examine. The test can set the result returned to ask function """ def __init__(self, result=None): diff --git a/Lib/idlelib/idle_test/test_pyparse.py b/Lib/idlelib/idle_test/test_pyparse.py index 0534301b3610..479b84a216b0 100644 --- a/Lib/idlelib/idle_test/test_pyparse.py +++ b/Lib/idlelib/idle_test/test_pyparse.py @@ -160,7 +160,7 @@ def test_study1(self): TestInfo('\n def function1(self, a,\n', [0, 1, 2], BRACKET), TestInfo('())\n', [0, 1], NONE), # Extra closer. TestInfo(')(\n', [0, 1], BRACKET), # Extra closer. - # For the mismatched example, it doesn't look like contination. + # For the mismatched example, it doesn't look like continuation. TestInfo('{)(]\n', [0, 1], NONE), # Mismatched. ) diff --git a/Lib/idlelib/search.py b/Lib/idlelib/search.py index 5bbe9d6b5dc8..b35f3b59c3d2 100644 --- a/Lib/idlelib/search.py +++ b/Lib/idlelib/search.py @@ -80,7 +80,7 @@ def find_again(self, text): If no search was previously run, open a new search dialog. In this case, no search is done. - If a seach was previously run, the search dialog won't be + If a search was previously run, the search dialog won't be shown and the options from the previous search (including the search pattern) will be used to find the next occurrence of the pattern. Next is relative based on direction. diff --git a/Lib/idlelib/searchbase.py b/Lib/idlelib/searchbase.py index 74ba8538512b..4ed94f186b04 100644 --- a/Lib/idlelib/searchbase.py +++ b/Lib/idlelib/searchbase.py @@ -36,7 +36,7 @@ def __init__(self, root, engine): text (Text searched): set in open(), only used in subclasses(). ent (ry): created in make_entry() called from create_entry(). row (of grid): 0 in create_widgets(), +1 in make_entry/frame(). - default_command: set in subclasses, used in create_widgers(). + default_command: set in subclasses, used in create_widgets(). title (of dialog): class attribute, override in subclasses. icon (of dialog): ditto, use unclear if cannot minimize dialog. diff --git a/Lib/idlelib/squeezer.py b/Lib/idlelib/squeezer.py index 869498d753a2..032401f2abc7 100644 --- a/Lib/idlelib/squeezer.py +++ b/Lib/idlelib/squeezer.py @@ -6,7 +6,7 @@ completely unusable. This extension will automatically replace long texts with a small button. -Double-cliking this button will remove it and insert the original text instead. +Double-clicking this button will remove it and insert the original text instead. Middle-clicking will copy the text to the clipboard. Right-clicking will open the text in a separate viewing window. diff --git a/Lib/idlelib/undo.py b/Lib/idlelib/undo.py index f048994b7d15..85ecffecb4cb 100644 --- a/Lib/idlelib/undo.py +++ b/Lib/idlelib/undo.py @@ -2,7 +2,7 @@ from idlelib.delegator import Delegator -# tkintter import not needed because module does not create widgets, +# tkinter import not needed because module does not create widgets, # although many methods operate on text widget arguments. #$ event <<redo>>

1 0

bpo-36546: Add design notes to aid future discussions (GH-13769)
by Raymond Hettinger 03 Jun '19

03 Jun '19

https://github.com/python/cpython/commit/cba9f84725353455b0995bd47d0fa8cb17… commit: cba9f84725353455b0995bd47d0fa8cb1724464b branch: master author: Raymond Hettinger <rhettinger(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-06-02T21:07:43-07:00 summary: bpo-36546: Add design notes to aid future discussions (GH-13769) files: M Lib/statistics.py diff --git a/Lib/statistics.py b/Lib/statistics.py index 19db8e828010..012845b8d2ef 100644 --- a/Lib/statistics.py +++ b/Lib/statistics.py @@ -564,6 +564,45 @@ def multimode(data): maxcount, mode_items = next(groupby(counts, key=itemgetter(1)), (0, [])) return list(map(itemgetter(0), mode_items)) +# Notes on methods for computing quantiles +# ---------------------------------------- +# +# There is no one perfect way to compute quantiles. Here we offer +# two methods that serve common needs. Most other packages +# surveyed offered at least one or both of these two, making them +# "standard" in the sense of "widely-adopted and reproducible". +# They are also easy to explain, easy to compute manually, and have +# straight-forward interpretations that aren't surprising. + +# The default method is known as "R6", "PERCENTILE.EXC", or "expected +# value of rank order statistics". The alternative method is known as +# "R7", "PERCENTILE.INC", or "mode of rank order statistics". + +# For sample data where there is a positive probability for values +# beyond the range of the data, the R6 exclusive method is a +# reasonable choice. Consider a random sample of nine values from a +# population with a uniform distribution from 0.0 to 100.0. The +# distribution of the third ranked sample point is described by +# betavariate(alpha=3, beta=7) which has mode=0.250, median=0.286, and +# mean=0.300. Only the latter (which corresponds with R6) gives the +# desired cut point with 30% of the population falling below that +# value, making it comparable to a result from an inv_cdf() function. + +# For describing population data where the end points are known to +# be included in the data, the R7 inclusive method is a reasonable +# choice. Instead of the mean, it uses the mode of the beta +# distribution for the interior points. Per Hyndman & Fan, "One nice +# property is that the vertices of Q7(p) divide the range into n - 1 +# intervals, and exactly 100p% of the intervals lie to the left of +# Q7(p) and 100(1 - p)% of the intervals lie to the right of Q7(p)." + +# If the need arises, we could add method="median" for a median +# unbiased, distribution-free alternative. Also if needed, the +# distribution-free approaches could be augmented by adding +# method='normal'. However, for now, the position is that fewer +# options make for easier choices and that external packages can be +# used for anything more advanced. + def quantiles(dist, *, n=4, method='exclusive'): '''Divide *dist* into *n* continuous intervals with equal probability.

1 0

Fix variable name copy/paste error in build-installer.py (GH-13038)
by Miss Islington (bot) 03 Jun '19

03 Jun '19

https://github.com/python/cpython/commit/74bede0d503d0508e9590f4ad65ee48b0a… commit: 74bede0d503d0508e9590f4ad65ee48b0ab93db6 branch: 2.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-06-02T20:39:38-07:00 summary: Fix variable name copy/paste error in build-installer.py (GH-13038) (cherry picked from commit d337169156933eaf732566bf29eb968549ada5e8) Co-authored-by: cclauss <cclauss(a)me.com> files: M Mac/BuildScript/build-installer.py diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 74d1e84f4a9b..bf038797c5e9 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -1553,7 +1553,7 @@ def buildDMG(): print(" -- retrying hdiutil create") time.sleep(5) else: - raise RuntimeError("command failed: %s"%(commandline,)) + raise RuntimeError("command failed: %s"%(cmd,)) if not os.path.exists(os.path.join(WORKDIR, "mnt")): os.mkdir(os.path.join(WORKDIR, "mnt"))

1 0

Fix variable name copy/paste error in build-installer.py (GH-13038)
by Miss Islington (bot) 03 Jun '19

03 Jun '19

https://github.com/python/cpython/commit/4a941e69822c042c1ef41ad34e89a6acd4… commit: 4a941e69822c042c1ef41ad34e89a6acd436490b branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-06-02T20:36:33-07:00 summary: Fix variable name copy/paste error in build-installer.py (GH-13038) (cherry picked from commit d337169156933eaf732566bf29eb968549ada5e8) Co-authored-by: cclauss <cclauss(a)me.com> files: M Mac/BuildScript/build-installer.py diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 2e3a61ec71d1..3ee2fba82688 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -1538,7 +1538,7 @@ def buildDMG(): print(" -- retrying hdiutil create") time.sleep(5) else: - raise RuntimeError("command failed: %s"%(commandline,)) + raise RuntimeError("command failed: %s"%(cmd,)) if not os.path.exists(os.path.join(WORKDIR, "mnt")): os.mkdir(os.path.join(WORKDIR, "mnt"))

1 0

Fix variable name copy/paste error in build-installer.py (GH-13038)
by Ned Deily 03 Jun '19

03 Jun '19

https://github.com/python/cpython/commit/d337169156933eaf732566bf29eb968549… commit: d337169156933eaf732566bf29eb968549ada5e8 branch: master author: cclauss <cclauss(a)me.com> committer: Ned Deily <nad(a)python.org> date: 2019-06-02T23:19:44-04:00 summary: Fix variable name copy/paste error in build-installer.py (GH-13038) files: M Mac/BuildScript/build-installer.py diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index fb43da5478f7..60e28fee055d 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -1540,7 +1540,7 @@ def buildDMG(): print(" -- retrying hdiutil create") time.sleep(5) else: - raise RuntimeError("command failed: %s"%(commandline,)) + raise RuntimeError("command failed: %s"%(cmd,)) if not os.path.exists(os.path.join(WORKDIR, "mnt")): os.mkdir(os.path.join(WORKDIR, "mnt"))

1 0