Mailman 3 September 2017 - Python-checkins

bpo-31285: Remove splitlines identifier from Python/_warnings.c (#3803)
by Serhiy Storchaka Sept. 29, 2017

Sept. 29, 2017

https://github.com/python/cpython/commit/8b4ff53c440dfcde40fbeb02c5e666c851… commit: 8b4ff53c440dfcde40fbeb02c5e666c85190528f branch: master author: Oren Milman <orenmn(a)gmail.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2017-09-29T21:16:02+03:00 summary: bpo-31285: Remove splitlines identifier from Python/_warnings.c (#3803) (forgot to remove it in #3219) files: M Python/_warnings.c diff --git a/Python/_warnings.c b/Python/_warnings.c index 4ea9fce47cf..… [View More]

1 0

bpo-31638: Add compression support to zipapp (GH-3819)
by Paul Moore Sept. 29, 2017

Sept. 29, 2017

https://github.com/python/cpython/commit/d87b105ca794addf92addb28293c92a7ef… commit: d87b105ca794addf92addb28293c92a7ef4141e1 branch: master author: Zhiming Wang <zmwangx(a)gmail.com> committer: Paul Moore <p.f.moore(a)gmail.com> date: 2017-09-29T18:31:52+01:00 summary: bpo-31638: Add compression support to zipapp (GH-3819) Add optional argument `compressed` to `zipapp.create_archive`, and add option `--compress` to the command line interface of `zipapp`. files: A Misc/NEWS.d/… [View More]next/Library/2017-09-29-07-14-28.bpo-31638.jElfhl.rst M Doc/library/zipapp.rst M Doc/whatsnew/3.7.rst M Lib/test/test_zipapp.py M Lib/zipapp.py diff --git a/Doc/library/zipapp.rst b/Doc/library/zipapp.rst index 120bbbb6620..2bd65cba42e 100644 --- a/Doc/library/zipapp.rst +++ b/Doc/library/zipapp.rst @@ -79,6 +79,13 @@ The following options are understood: :option:`--main` cannot be specified when copying an archive. +.. cmdoption:: -c, --compress + + Compress files with the deflate method, reducing the size of the output + file. By default, files are stored uncompressed in the archive. + + :option:`--compress` has no effect when copying an archive. + .. cmdoption:: --info Display the interpreter embedded in the archive, for diagnostic purposes. In @@ -98,8 +105,7 @@ Python API The module defines two convenience functions: -.. function:: create_archive(source, target=None, interpreter=None, main=None, - filter=None) +.. function:: create_archive(source, target=None, interpreter=None, main=None, filter=None, compressed=False) Create an application archive from *source*. The source can be any of the following: @@ -149,6 +155,11 @@ The module defines two convenience functions: (relative to the source directory). It should return ``True`` if the file is to be added. + The optional *compressed* argument determines whether files are + compressed. If set to ``True``, files in the archive are compressed + with the deflate method; otherwise, files are stored uncompressed. + This argument has no effect when copying an existing archive. + If a file object is specified for *source* or *target*, it is the caller's responsibility to close it after calling create_archive. @@ -159,7 +170,7 @@ The module defines two convenience functions: needed by that class. .. versionadded:: 3.7 - Added the *filter* argument. + Added the *filter* and *compressed* arguments. .. function:: get_interpreter(archive) diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst index a19a2895828..a474e767529 100644 --- a/Doc/whatsnew/3.7.rst +++ b/Doc/whatsnew/3.7.rst @@ -285,9 +285,13 @@ zipapp ------ Function :func:`zipapp.create_archive` now accepts an optional *filter* -argument, to allow the user to select which files should be included in the +argument to allow the user to select which files should be included in the +archive, and an optional *compressed* argument to generate a compressed archive. +A command line option ``--compress`` has also been added to support +compression. + Optimizations ============= diff --git a/Lib/test/test_zipapp.py b/Lib/test/test_zipapp.py index 56cf37c9afa..3602b9989ae 100644 --- a/Lib/test/test_zipapp.py +++ b/Lib/test/test_zipapp.py @@ -100,6 +100,20 @@ def test_create_archive_default_target(self): expected_target = self.tmpdir / 'source.pyz' self.assertTrue(expected_target.is_file()) + def test_create_archive_with_compression(self): + # Test packing a directory into a compressed archive. + source = self.tmpdir / 'source' + source.mkdir() + (source / '__main__.py').touch() + (source / 'test.py').touch() + target = self.tmpdir / 'source.pyz' + + zipapp.create_archive(source, target, compressed=True) + with zipfile.ZipFile(target, 'r') as z: + for name in ('__main__.py', 'test.py'): + self.assertEqual(z.getinfo(name).compress_type, + zipfile.ZIP_DEFLATED) + def test_no_main(self): # Test that packing a directory with no __main__.py fails. source = self.tmpdir / 'source' diff --git a/Lib/zipapp.py b/Lib/zipapp.py index 51d0290a901..ce77632516c 100644 --- a/Lib/zipapp.py +++ b/Lib/zipapp.py @@ -74,7 +74,7 @@ def _copy_archive(archive, new_archive, interpreter=None): def create_archive(source, target=None, interpreter=None, main=None, - filter=None): + filter=None, compressed=False): """Create an application archive from SOURCE. The SOURCE can be the name of a directory, or a filename or a file-like @@ -133,7 +133,9 @@ def create_archive(source, target=None, interpreter=None, main=None, with _maybe_open(target, 'wb') as fd: _write_file_prefix(fd, interpreter) - with zipfile.ZipFile(fd, 'w') as z: + compression = (zipfile.ZIP_DEFLATED if compressed else + zipfile.ZIP_STORED) + with zipfile.ZipFile(fd, 'w', compression=compression) as z: for child in source.rglob('*'): arcname = child.relative_to(source) if filter is None or filter(arcname): @@ -170,6 +172,9 @@ def main(args=None): parser.add_argument('--main', '-m', default=None, help="The main function of the application " "(default: use an existing __main__.py).") + parser.add_argument('--compress', '-c', action='store_true', + help="Compress files with the deflate method. " + "Files are stored uncompressed by default.") parser.add_argument('--info', default=False, action='store_true', help="Display the interpreter from the archive.") parser.add_argument('source', @@ -193,7 +198,8 @@ def main(args=None): raise SystemExit("Cannot change the main function when copying") create_archive(args.source, args.output, - interpreter=args.python, main=args.main) + interpreter=args.python, main=args.main, + compressed=args.compress) if __name__ == '__main__': diff --git a/Misc/NEWS.d/next/Library/2017-09-29-07-14-28.bpo-31638.jElfhl.rst b/Misc/NEWS.d/next/Library/2017-09-29-07-14-28.bpo-31638.jElfhl.rst new file mode 100644 index 00000000000..29e504e9a2c --- /dev/null +++ b/Misc/NEWS.d/next/Library/2017-09-29-07-14-28.bpo-31638.jElfhl.rst @@ -0,0 +1,2 @@ +Add optional argument ``compressed`` to ``zipapp.create_archive``, and add +option ``--compress`` to the command line interface of ``zipapp``. [View Less]

1 0

explicitly list objects for the ar command (#3824)
by Benjamin Peterson Sept. 29, 2017

Sept. 29, 2017

https://github.com/python/cpython/commit/6fb0e4a6d085ffa4e4a6daaea042a1cc51… commit: 6fb0e4a6d085ffa4e4a6daaea042a1cc517fa8bc branch: master author: Benjamin Peterson <benjamin(a)python.org> committer: GitHub <noreply(a)github.com> date: 2017-09-29T09:26:48-07:00 summary: explicitly list objects for the ar command (#3824) $^ is not portable. closes bpo-31625 files: M Makefile.pre.in diff --git a/Makefile.pre.in b/Makefile.pre.in index 90eecd82173..e8df8f7355e 100644 --- a/… [View More]

1 0

stop using ranlib (closes bpo-31625) (#3815)
by Benjamin Peterson Sept. 29, 2017

Sept. 29, 2017

https://github.com/python/cpython/commit/d15108a4789aa1e3c12b2890b770550c90… commit: d15108a4789aa1e3c12b2890b770550c90a30913 branch: master author: Benjamin Peterson <benjamin(a)python.org> committer: GitHub <noreply(a)github.com> date: 2017-09-29T08:42:41-07:00 summary: stop using ranlib (closes bpo-31625) (#3815) Instead, simply pass 's' to ar. files: A Misc/NEWS.d/next/Build/2017-09-28-23-21-20.bpo-31625.Bb2NXr.rst M Makefile.pre.in M configure M configure.ac diff --git a/… [View More]Makefile.pre.in b/Makefile.pre.in index 8f4918dff6e..90eecd82173 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -38,7 +38,6 @@ CXX= @CXX@ MAINCC= @MAINCC@ LINKCC= @LINKCC@ AR= @AR@ -RANLIB= @RANLIB@ READELF= @READELF@ SOABI= @SOABI@ LDVERSION= @LDVERSION@ @@ -577,16 +576,9 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o # Build static library -# avoid long command lines, same as LIBRARY_OBJS $(LIBRARY): $(LIBRARY_OBJS) -rm -f $@ - $(AR) $(ARFLAGS) $@ Modules/getbuildinfo.o - $(AR) $(ARFLAGS) $@ $(PARSER_OBJS) - $(AR) $(ARFLAGS) $@ $(OBJECT_OBJS) - $(AR) $(ARFLAGS) $@ $(PYTHON_OBJS) Python/frozen.o - $(AR) $(ARFLAGS) $@ $(MODULE_OBJS) - $(AR) $(ARFLAGS) $@ $(MODOBJS) - $(RANLIB) $@ + $(AR) $(ARFLAGS) $@ $^ libpython$(LDVERSION).so: $(LIBRARY_OBJS) if test $(INSTSONAME) != $(LDLIBRARY); then \ @@ -1422,7 +1414,6 @@ libainstall: @DEF_MAKE_RULE@ python-config $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \ else \ $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ - $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ fi; \ else \ echo Skip install of $(LIBRARY) - use make frameworkinstall; \ diff --git a/Misc/NEWS.d/next/Build/2017-09-28-23-21-20.bpo-31625.Bb2NXr.rst b/Misc/NEWS.d/next/Build/2017-09-28-23-21-20.bpo-31625.Bb2NXr.rst new file mode 100644 index 00000000000..dbd078f0030 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2017-09-28-23-21-20.bpo-31625.Bb2NXr.rst @@ -0,0 +1 @@ +Stop using ranlib on static libraries. Instead, we assume ar supports the 's' flag. diff --git a/configure b/configure index cef9b6f2189..8a763ef6e49 100755 --- a/configure +++ b/configure @@ -692,7 +692,6 @@ READELF ARFLAGS ac_ct_AR AR -RANLIB GNULD LINKCC LDVERSION @@ -5944,98 +5943,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LDLIBRARY" >&5 $as_echo "$LDLIBRARY" >&6; } -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -$as_echo "$ac_ct_RANLIB" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_RANLIB" = x; then - RANLIB=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - RANLIB=$ac_ct_RANLIB - fi -else - RANLIB="$ac_cv_prog_RANLIB" -fi - if test -n "$ac_tool_prefix"; then for ac_prog in ar aal @@ -6142,7 +6049,7 @@ fi if test -z "$ARFLAGS" then - ARFLAGS="rc" + ARFLAGS="rcs" fi if test -n "$ac_tool_prefix"; then diff --git a/configure.ac b/configure.ac index 3218162f1be..41bd9effbfd 100644 --- a/configure.ac +++ b/configure.ac @@ -1161,7 +1161,6 @@ fi AC_MSG_RESULT($LDLIBRARY) -AC_PROG_RANLIB AC_SUBST(AR) AC_CHECK_TOOLS(AR, ar aal, ar) @@ -1169,7 +1168,7 @@ AC_CHECK_TOOLS(AR, ar aal, ar) AC_SUBST(ARFLAGS) if test -z "$ARFLAGS" then - ARFLAGS="rc" + ARFLAGS="rcs" fi AC_CHECK_TOOLS([READELF], [readelf], [:]) [View Less]

1 0

[3.6] bpo-25351: avoid activate failure on strict shells (GH-3804) (#3820)
by Victor Stinner Sept. 29, 2017

Sept. 29, 2017

https://github.com/python/cpython/commit/a5610e07460a8df4b0923a32d37234cd53… commit: a5610e07460a8df4b0923a32d37234cd535ec952 branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Victor Stinner <victor.stinner(a)gmail.com> date: 2017-09-29T05:34:43-07:00 summary: [3.6] bpo-25351: avoid activate failure on strict shells (GH-3804) (#3820) (cherry picked from commit 90f1d989594f3340c5ffaa2cf9cef1876ac6bb89) files: A Misc/NEWS.d/… [View More]next/Library/2017-09-28-23-10-51.bpo-25351.2JmFpF.rst M Lib/venv/scripts/common/activate diff --git a/Lib/venv/scripts/common/activate b/Lib/venv/scripts/common/activate index c78a4efa153..fff0765af53 100644 --- a/Lib/venv/scripts/common/activate +++ b/Lib/venv/scripts/common/activate @@ -3,13 +3,13 @@ deactivate () { # reset old environment variables - if [ -n "$_OLD_VIRTUAL_PATH" ] ; then - PATH="$_OLD_VIRTUAL_PATH" + if [ -n "${_OLD_VIRTUAL_PATH:-}" ] ; then + PATH="${_OLD_VIRTUAL_PATH:-}" export PATH unset _OLD_VIRTUAL_PATH fi - if [ -n "$_OLD_VIRTUAL_PYTHONHOME" ] ; then - PYTHONHOME="$_OLD_VIRTUAL_PYTHONHOME" + if [ -n "${_OLD_VIRTUAL_PYTHONHOME:-}" ] ; then + PYTHONHOME="${_OLD_VIRTUAL_PYTHONHOME:-}" export PYTHONHOME unset _OLD_VIRTUAL_PYTHONHOME fi @@ -17,12 +17,12 @@ deactivate () { # This should detect bash and zsh, which have a hash command that must # be called to get it to forget past commands. Without forgetting # past commands the $PATH changes we made may not be respected - if [ -n "$BASH" -o -n "$ZSH_VERSION" ] ; then + if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then hash -r fi - if [ -n "$_OLD_VIRTUAL_PS1" ] ; then - PS1="$_OLD_VIRTUAL_PS1" + if [ -n "${_OLD_VIRTUAL_PS1:-}" ] ; then + PS1="${_OLD_VIRTUAL_PS1:-}" export PS1 unset _OLD_VIRTUAL_PS1 fi @@ -47,15 +47,15 @@ export PATH # unset PYTHONHOME if set # this will fail if PYTHONHOME is set to the empty string (which is bad anyway) # could use `if (set -u; : $PYTHONHOME) ;` in bash -if [ -n "$PYTHONHOME" ] ; then - _OLD_VIRTUAL_PYTHONHOME="$PYTHONHOME" +if [ -n "${PYTHONHOME:-}" ] ; then + _OLD_VIRTUAL_PYTHONHOME="${PYTHONHOME:-}" unset PYTHONHOME fi -if [ -z "$VIRTUAL_ENV_DISABLE_PROMPT" ] ; then - _OLD_VIRTUAL_PS1="$PS1" +if [ -z "${VIRTUAL_ENV_DISABLE_PROMPT:-}" ] ; then + _OLD_VIRTUAL_PS1="${PS1:-}" if [ "x__VENV_PROMPT__" != x ] ; then - PS1="__VENV_PROMPT__$PS1" + PS1="__VENV_PROMPT__${PS1:-}" else if [ "`basename \"$VIRTUAL_ENV\"`" = "__" ] ; then # special case for Aspen magic directories @@ -71,6 +71,6 @@ fi # This should detect bash and zsh, which have a hash command that must # be called to get it to forget past commands. Without forgetting # past commands the $PATH changes we made may not be respected -if [ -n "$BASH" -o -n "$ZSH_VERSION" ] ; then +if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then hash -r fi diff --git a/Misc/NEWS.d/next/Library/2017-09-28-23-10-51.bpo-25351.2JmFpF.rst b/Misc/NEWS.d/next/Library/2017-09-28-23-10-51.bpo-25351.2JmFpF.rst new file mode 100644 index 00000000000..f7afc2570aa --- /dev/null +++ b/Misc/NEWS.d/next/Library/2017-09-28-23-10-51.bpo-25351.2JmFpF.rst @@ -0,0 +1 @@ +Avoid venv activate failures with undefined variables [View Less]

1 0

bpo-25351: avoid activate failure on strict shells (GH-3804)
by Vinay Sajip Sept. 29, 2017

Sept. 29, 2017

https://github.com/python/cpython/commit/90f1d989594f3340c5ffaa2cf9cef1876a… commit: 90f1d989594f3340c5ffaa2cf9cef1876ac6bb89 branch: master author: Sorin Sbarnea <ssbarnea(a)users.noreply.github.com> committer: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: 2017-09-29T12:48:11+01:00 summary: bpo-25351: avoid activate failure on strict shells (GH-3804) files: A Misc/NEWS.d/next/Library/2017-09-28-23-10-51.bpo-25351.2JmFpF.rst M Lib/venv/scripts/common/activate diff --git a/Lib/… [View More]venv/scripts/common/activate b/Lib/venv/scripts/common/activate index c78a4efa153..fff0765af53 100644 --- a/Lib/venv/scripts/common/activate +++ b/Lib/venv/scripts/common/activate @@ -3,13 +3,13 @@ deactivate () { # reset old environment variables - if [ -n "$_OLD_VIRTUAL_PATH" ] ; then - PATH="$_OLD_VIRTUAL_PATH" + if [ -n "${_OLD_VIRTUAL_PATH:-}" ] ; then + PATH="${_OLD_VIRTUAL_PATH:-}" export PATH unset _OLD_VIRTUAL_PATH fi - if [ -n "$_OLD_VIRTUAL_PYTHONHOME" ] ; then - PYTHONHOME="$_OLD_VIRTUAL_PYTHONHOME" + if [ -n "${_OLD_VIRTUAL_PYTHONHOME:-}" ] ; then + PYTHONHOME="${_OLD_VIRTUAL_PYTHONHOME:-}" export PYTHONHOME unset _OLD_VIRTUAL_PYTHONHOME fi @@ -17,12 +17,12 @@ deactivate () { # This should detect bash and zsh, which have a hash command that must # be called to get it to forget past commands. Without forgetting # past commands the $PATH changes we made may not be respected - if [ -n "$BASH" -o -n "$ZSH_VERSION" ] ; then + if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then hash -r fi - if [ -n "$_OLD_VIRTUAL_PS1" ] ; then - PS1="$_OLD_VIRTUAL_PS1" + if [ -n "${_OLD_VIRTUAL_PS1:-}" ] ; then + PS1="${_OLD_VIRTUAL_PS1:-}" export PS1 unset _OLD_VIRTUAL_PS1 fi @@ -47,15 +47,15 @@ export PATH # unset PYTHONHOME if set # this will fail if PYTHONHOME is set to the empty string (which is bad anyway) # could use `if (set -u; : $PYTHONHOME) ;` in bash -if [ -n "$PYTHONHOME" ] ; then - _OLD_VIRTUAL_PYTHONHOME="$PYTHONHOME" +if [ -n "${PYTHONHOME:-}" ] ; then + _OLD_VIRTUAL_PYTHONHOME="${PYTHONHOME:-}" unset PYTHONHOME fi -if [ -z "$VIRTUAL_ENV_DISABLE_PROMPT" ] ; then - _OLD_VIRTUAL_PS1="$PS1" +if [ -z "${VIRTUAL_ENV_DISABLE_PROMPT:-}" ] ; then + _OLD_VIRTUAL_PS1="${PS1:-}" if [ "x__VENV_PROMPT__" != x ] ; then - PS1="__VENV_PROMPT__$PS1" + PS1="__VENV_PROMPT__${PS1:-}" else if [ "`basename \"$VIRTUAL_ENV\"`" = "__" ] ; then # special case for Aspen magic directories @@ -71,6 +71,6 @@ fi # This should detect bash and zsh, which have a hash command that must # be called to get it to forget past commands. Without forgetting # past commands the $PATH changes we made may not be respected -if [ -n "$BASH" -o -n "$ZSH_VERSION" ] ; then +if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then hash -r fi diff --git a/Misc/NEWS.d/next/Library/2017-09-28-23-10-51.bpo-25351.2JmFpF.rst b/Misc/NEWS.d/next/Library/2017-09-28-23-10-51.bpo-25351.2JmFpF.rst new file mode 100644 index 00000000000..f7afc2570aa --- /dev/null +++ b/Misc/NEWS.d/next/Library/2017-09-28-23-10-51.bpo-25351.2JmFpF.rst @@ -0,0 +1 @@ +Avoid venv activate failures with undefined variables [View Less]

1 0

Daily reference leaks (4243df51fe43): sum=5
by solipsis＠pitrou.net Sept. 29, 2017

Sept. 29, 2017

results for 4243df51fe43 on branch "default" -------------------------------------------- test_collections leaked [7, -7, 1] memory blocks, sum=1 test_functools leaked [0, 3, 1] memory blocks, sum=4 test_multiprocessing_forkserver leaked [-2, 1, 1] memory blocks, sum=0 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogeLBmCV', '--timeout', '7200']

1 0

remove support for BSD/OS (closes bpo-31624) (#3812)
by Benjamin Peterson Sept. 29, 2017

Sept. 29, 2017

https://github.com/python/cpython/commit/288d1daadaddf6ae35cf666138ba4b5d07… commit: 288d1daadaddf6ae35cf666138ba4b5d07449657 branch: master author: Benjamin Peterson <benjamin(a)python.org> committer: GitHub <noreply(a)github.com> date: 2017-09-28T22:44:27-07:00 summary: remove support for BSD/OS (closes bpo-31624) (#3812) files: A Misc/NEWS.d/next/Build/2017-09-28-20-54-52.bpo-31624.11w91_.rst M Include/pyport.h M Include/unicodeobject.h M Lib/distutils/util.py M Lib/sysconfig.… [View More]py M Lib/test/test_fcntl.py M Modules/posixmodule.c M Python/thread_pthread.h M configure M configure.ac diff --git a/Include/pyport.h b/Include/pyport.h index dbf6db68768..2742e477fd4 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -556,16 +556,6 @@ extern char * _getpty(int *, int, mode_t, int); #include <sys/termio.h> #endif -#if defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY) -#if !defined(HAVE_PTY_H) && !defined(HAVE_LIBUTIL_H) -/* BSDI does not supply a prototype for the 'openpty' and 'forkpty' - functions, even though they are included in libutil. */ -#include <termios.h> -extern int openpty(int *, int *, char *, struct termios *, struct winsize *); -extern pid_t forkpty(int *, char *, struct termios *, struct winsize *); -#endif /* !defined(HAVE_PTY_H) && !defined(HAVE_LIBUTIL_H) */ -#endif /* defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY) */ - /* On 4.4BSD-descendants, ctype functions serves the whole range of * wchar_t character set rather than single byte code points only. diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h index 5ca1f87013f..d2a8ec281f1 100644 --- a/Include/unicodeobject.h +++ b/Include/unicodeobject.h @@ -104,10 +104,6 @@ typedef wchar_t Py_UNICODE /* Py_DEPRECATED(3.3) */; #endif #ifdef HAVE_WCHAR_H -/* Work around a cosmetic bug in BSDI 4.x wchar.h; thanks to Thomas Wouters */ -# ifdef _HAVE_BSDI -# include <time.h> -# endif # include <wchar.h> #endif diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py index 9394c1e0564..83682628ba6 100644 --- a/Lib/distutils/util.py +++ b/Lib/distutils/util.py @@ -53,8 +53,8 @@ def get_platform (): (osname, host, release, version, machine) = os.uname() - # Convert the OS name to lowercase, remove '/' characters - # (to accommodate BSD/OS), and translate spaces (for "Power Macintosh") + # Convert the OS name to lowercase, remove '/' characters, and translate + # spaces (for "Power Macintosh") osname = osname.lower().replace('/', '') machine = machine.replace(' ', '_') machine = machine.replace('/', '-') diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py index 8dfe1a714d5..9ee4d3185a7 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py @@ -632,8 +632,8 @@ def get_platform(): # Try to distinguish various flavours of Unix osname, host, release, version, machine = os.uname() - # Convert the OS name to lowercase, remove '/' characters - # (to accommodate BSD/OS), and translate spaces (for "Power Macintosh") + # Convert the OS name to lowercase, remove '/' characters, and translate + # spaces (for "Power Macintosh") osname = osname.lower().replace('/', '') machine = machine.replace(' ', '_') machine = machine.replace('/', '-') diff --git a/Lib/test/test_fcntl.py b/Lib/test/test_fcntl.py index e3b7ed20a08..acd5c7cc586 100644 --- a/Lib/test/test_fcntl.py +++ b/Lib/test/test_fcntl.py @@ -22,7 +22,7 @@ def get_lockdata(): else: start_len = "qq" - if (sys.platform.startswith(('netbsd', 'freebsd', 'openbsd', 'bsdos')) + if (sys.platform.startswith(('netbsd', 'freebsd', 'openbsd')) or sys.platform == 'darwin'): if struct.calcsize('l') == 8: off_t = 'l' diff --git a/Misc/NEWS.d/next/Build/2017-09-28-20-54-52.bpo-31624.11w91_.rst b/Misc/NEWS.d/next/Build/2017-09-28-20-54-52.bpo-31624.11w91_.rst new file mode 100644 index 00000000000..c329b43c4df --- /dev/null +++ b/Misc/NEWS.d/next/Build/2017-09-28-20-54-52.bpo-31624.11w91_.rst @@ -0,0 +1 @@ +Remove support for BSD/OS. diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 83135e536a5..13ff9166e71 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -3967,7 +3967,7 @@ os_nice_impl(PyObject *module, int increment) /* There are two flavours of 'nice': one that returns the new priority (as required by almost all standards out there) and the - Linux/FreeBSD/BSDI one, which returns '0' on success and advices + Linux/FreeBSD one, which returns '0' on success and advices the use of getpriority() to get the new priority. If we are of the nice family that returns the new priority, we diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h index ea05b6fbcfe..2dcd107c2ce 100644 --- a/Python/thread_pthread.h +++ b/Python/thread_pthread.h @@ -149,25 +149,6 @@ typedef struct { /* * Initialization. */ - -#if defined(_HAVE_BSDI) -static -void _noop(void) -{ -} - -static void -PyThread__init_thread(void) -{ - /* DO AN INIT BY STARTING THE THREAD */ - static int dummy = 0; - pthread_t thread1; - pthread_create(&thread1, NULL, (void *) _noop, &dummy); - pthread_join(thread1, NULL); -} - -#else /* !_HAVE_BSDI */ - static void PyThread__init_thread(void) { @@ -177,8 +158,6 @@ PyThread__init_thread(void) #endif } -#endif /* !_HAVE_BSDI */ - /* * Thread support. */ diff --git a/configure b/configure index 819dc7a0c16..cef9b6f2189 100755 --- a/configure +++ b/configure @@ -5703,13 +5703,6 @@ $as_echo "no" >&6; } fi rmdir CaseSensitiveTestDir -case $MACHDEP in -bsdos*) - case $CC in - gcc) CC="$CC -D_HAVE_BSDI";; - esac;; -esac - case $ac_sys_system in hp*|HP*) case $CC in @@ -6263,8 +6256,8 @@ fi case $MACHDEP in -bsdos*|hp*|HP*) - # install -d does not work on BSDI or HP-UX +hp*|HP*) + # install -d does not work on HP-UX if test -z "$INSTALL" then INSTALL="${srcdir}/install-sh -c" @@ -9228,9 +9221,6 @@ then Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared' LDCXXSHARED='$(CXX) -shared';; - BSD/OS*/4*) - LDSHARED="gcc -shared" - LDCXXSHARED="g++ -shared";; FreeBSD*) if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ] then @@ -9298,7 +9288,6 @@ then fi;; Linux-android*) ;; Linux*|GNU*) CCSHARED="-fPIC";; - BSD/OS*/4*) CCSHARED="-fpic";; FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";; OpenUNIX*|UnixWare*) if test "$GCC" = "yes" @@ -9325,7 +9314,6 @@ then hp*|HP*) LINKFORSHARED="-Wl,-E -Wl,+s";; # LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";; - BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";; Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";; Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";; # -u libsys_s pulls in all symbols in libsys diff --git a/configure.ac b/configure.ac index e90d05d1c8d..3218162f1be 100644 --- a/configure.ac +++ b/configure.ac @@ -948,13 +948,6 @@ else fi rmdir CaseSensitiveTestDir -case $MACHDEP in -bsdos*) - case $CC in - gcc) CC="$CC -D_HAVE_BSDI";; - esac;; -esac - case $ac_sys_system in hp*|HP*) case $CC in @@ -1191,8 +1184,8 @@ AC_SUBST(READELF) case $MACHDEP in -bsdos*|hp*|HP*) - # install -d does not work on BSDI or HP-UX +hp*|HP*) + # install -d does not work on HP-UX if test -z "$INSTALL" then INSTALL="${srcdir}/install-sh -c" @@ -2492,9 +2485,6 @@ then Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared' LDCXXSHARED='$(CXX) -shared';; - BSD/OS*/4*) - LDSHARED="gcc -shared" - LDCXXSHARED="g++ -shared";; FreeBSD*) if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]] then @@ -2560,7 +2550,6 @@ then fi;; Linux-android*) ;; Linux*|GNU*) CCSHARED="-fPIC";; - BSD/OS*/4*) CCSHARED="-fpic";; FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";; OpenUNIX*|UnixWare*) if test "$GCC" = "yes" @@ -2585,7 +2574,6 @@ then hp*|HP*) LINKFORSHARED="-Wl,-E -Wl,+s";; # LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";; - BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";; Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";; Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";; # -u libsys_s pulls in all symbols in libsys [View Less]

1 0

[1 down, 64 flat] Results for Python (master branch) 2017-09-28
by lp_benchmark_robot＠intel.com Sept. 29, 2017

Sept. 29, 2017

Results for project python/master, build date: 2017-09-28 03:03:07-07:00. - commit: d780b2d - previous commit: 236329e - revision date: 2017-09-28 10:50:01+03:00 - environment: Broadwell-EP - cpu: Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz 2x22 cores, stepping 1, LLC 55 MB - mem: 128 GB - os: Ubuntu 16.04.2 LTS - kernel: 4.4.0-62-generic x86_64 GNU/Linux Baseline results were generated using release v3.6.0, with hash 5c4568a from 2016-12-22 23:38:47+… [View More]00:00. +-----+------------------------+--------+------------+------------+------------+ | | |relative|change since|change since|current rev | | | benchmark|std_dev*| last run | baseline |run with PGO| +-----+------------------------+--------+------------+------------+------------+ | :-| | 2to3| 1.246% | -1.497% | +3.852% | +8.429% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method| 0.258% | -0.005% | +17.585% | +13.247% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method_slots| 0.333% | -0.057% | +18.978% | +12.030% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method_unknown| 0.787% | +0.029% | +17.365% | +11.534% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_simple| 2.956% | -0.536% | +2.995% | +13.193% | +-----+------------------------+--------+------------+------------+------------+ | :-| | chameleon| 1.502% | +0.317% | +11.514% | +9.305% | +-----+------------------------+--------+------------+------------+------------+ | :-| | chaos| 2.035% | -0.019% | +7.875% | +9.865% | +-----+------------------------+--------+------------+------------+------------+ | :-| | crypto_pyaes| 0.642% | -0.775% | +2.613% | +7.900% | +-----+------------------------+--------+------------+------------+------------+ | :-| | deltablue| 3.841% | +1.234% | +5.994% | +17.849% | +-----+------------------------+--------+------------+------------+------------+ | :-| | django_template| 3.165% | +0.185% | +10.951% | +11.302% | +-----+------------------------+--------+------------+------------+------------+ | :-| | dulwich_log| 1.334% | +1.116% | +4.799% | +6.169% | +-----+------------------------+--------+------------+------------+------------+ | :-| | fannkuch| 0.337% | +0.113% | +7.425% | +3.100% | +-----+------------------------+--------+------------+------------+------------+ | :-| | float| 1.077% | +0.252% | +4.291% | +4.921% | +-----+------------------------+--------+------------+------------+------------+ | :-| | genshi_text| 1.367% | -0.261% | +7.680% | +12.126% | +-----+------------------------+--------+------------+------------+------------+ | :-| | genshi_xml| 1.200% | +0.484% | +7.140% | +10.793% | +-----+------------------------+--------+------------+------------+------------+ | :-| | go| 0.883% | -0.204% | +7.510% | +9.143% | +-----+------------------------+--------+------------+------------+------------+ | :-| | hexiom| 1.641% | +0.067% | +9.470% | +11.215% | +-----+------------------------+--------+------------+------------+------------+ | :-| | html5lib| 2.931% | -0.079% | +8.684% | +9.371% | +-----+------------------------+--------+------------+------------+------------+ | :-| | json_dumps| 2.030% | -0.356% | +5.003% | +8.158% | +-----+------------------------+--------+------------+------------+------------+ | :-| | json_loads| 2.152% | -0.611% | +1.868% | +9.681% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_format| 1.378% | +0.398% | +9.963% | +9.791% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_silent| 2.258% | +0.835% | +46.779% | +10.898% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_simple| 1.329% | +1.187% | +10.302% | +12.358% | +-----+------------------------+--------+------------+------------+------------+ | :-| | mako| 0.422% | +0.362% | +19.147% | +10.009% | +-----+------------------------+--------+------------+------------+------------+ | :-| | mdp| 2.717% | -0.641% | +7.848% | +10.349% | +-----+------------------------+--------+------------+------------+------------+ | :-| | meteor_contest| 2.299% | +0.027% | +3.861% | +5.447% | +-----+------------------------+--------+------------+------------+------------+ | :-| | nbody| 0.936% | -0.325% | -0.906% | +3.754% | +-----+------------------------+--------+------------+------------+------------+ | :-| | nqueens| 2.334% | -0.022% | +1.235% | +7.962% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pathlib| 1.435% | +1.873% | +7.467% | +6.959% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle| 1.135% | -0.306% | +2.127% | +22.490% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_dict| 0.274% | -0.012% | +3.728% | +19.750% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_list| 0.926% | +0.229% | +6.671% | +17.856% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_pure_python| 4.609% | +1.204% | +12.298% | +8.383% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pidigits| 0.220% | +0.033% | +0.484% | +9.268% | +-----+------------------------+--------+------------+------------+------------+ | :-| | python_startup| 0.127% | +0.168% | +10.180% | +4.909% | +-----+------------------------+--------+------------+------------+------------+ | :-| | python_startup_no_site| 0.094% | +0.131% | +1.544% | +5.033% | +-----+------------------------+--------+------------+------------+------------+ | :-| | raytrace| 1.420% | +0.523% | +10.432% | +12.778% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_compile| 5.049% | -1.162% | -10.349% | +9.186% | +-----+------------------------+--------+------------+------------+------------+ | :-( | regex_dna| 0.249% | -3.922% | -2.023% | +12.033% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_effbot| 5.131% | -4.968% | -5.422% | +8.907% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_v8| 1.124% | -1.785% | +7.975% | +6.549% | +-----+------------------------+--------+------------+------------+------------+ | :-| | richards| 1.140% | +0.138% | +7.709% | +14.979% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_fft| 0.380% | +0.497% | +2.255% | -0.163% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_lu| 1.940% | -0.114% | +27.046% | +8.142% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_monte_carlo| 1.848% | -0.105% | +5.449% | +6.268% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_sor| 0.893% | -0.014% | +15.567% | +8.295% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_sparse_mat_mult| 1.249% | -0.385% | +4.360% | +0.026% | +-----+------------------------+--------+------------+------------+------------+ | :-| | spectral_norm| 0.733% | +0.069% | +6.361% | +2.023% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlalchemy_declarative| 0.843% | -0.210% | +6.253% | +6.479% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlalchemy_imperative| 3.771% | -0.679% | +5.609% | +5.016% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlite_synth| 3.207% | +1.347% | +20.903% | +7.673% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_expand| 2.496% | +0.025% | +11.435% | +9.008% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_integrate| 1.724% | +0.398% | +10.409% | +6.819% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_str| 3.887% | -0.156% | +11.753% | +8.918% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_sum| 5.623% | -0.348% | +10.936% | +9.468% | +-----+------------------------+--------+------------+------------+------------+ | :-| | telco| 4.103% | -0.977% | +23.809% | +10.848% | +-----+------------------------+--------+------------+------------+------------+ | :-| | tornado_http| 1.165% | -0.006% | +6.581% | +5.917% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpack_sequence| 9.070% | -1.967% | +0.456% | +2.805% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle| 6.033% | +0.503% | +9.058% | +20.469% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle_list| 1.148% | -0.003% | -1.991% | +18.351% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle_pure_python| 3.152% | -0.628% | +7.601% | +5.487% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_generate| 1.405% | -0.082% | +6.537% | +6.721% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_iterparse| 2.362% | +0.389% | +1.543% | +8.490% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_parse| 3.572% | +0.262% | -9.854% | +12.726% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_process| 1.514% | -0.323% | +6.548% | +7.927% | +-----+------------------------+--------+------------+------------+------------+ * Relative Standard Deviation (Standard Deviation/Average) If this is not displayed properly please visit our results page here: http://languagesperformance.intel.com/1-down-64-flat-results-for-python-mas… Our lab does a nightly source pull and build of the Python project and measures performance changes against the previous stable version and the previous nightly measurement. This is provided as a service to the community so that quality issues with current hardware can be identified quickly. Intel technologies' features and benefits depend on system configuration and may require enabled hardware, software or service activation. Performance varies depending on system configuration. [View Less]

1 0

bpo-11063, bpo-20519: avoid ctypes and improve import time for uuid (#3796)
by Antoine Pitrou Sept. 28, 2017

Sept. 28, 2017

https://github.com/python/cpython/commit/a106aec2ed6ba171838ca7e6ba43c4e722… commit: a106aec2ed6ba171838ca7e6ba43c4e722bbecd1 branch: master author: Antoine Pitrou <pitrou(a)free.fr> committer: GitHub <noreply(a)github.com> date: 2017-09-28T23:03:06+02:00 summary: bpo-11063, bpo-20519: avoid ctypes and improve import time for uuid (#3796) bpo-11063, bpo-20519: avoid ctypes and improve import time for uuid. files: A Misc/NEWS.d/next/Library/2017-09-28-13-17-33.bpo-20519.FteeQQ.rst … [View More]A Modules/_uuidmodule.c M Lib/test/test_uuid.py M Lib/uuid.py M setup.py diff --git a/Lib/test/test_uuid.py b/Lib/test/test_uuid.py index cd0f81e7e14..083c2aa8aab 100644 --- a/Lib/test/test_uuid.py +++ b/Lib/test/test_uuid.py @@ -1,11 +1,15 @@ import unittest.mock from test import support import builtins +import contextlib import io import os import shutil import subprocess -import uuid + +py_uuid = support.import_fresh_module('uuid', blocked=['_uuid']) +c_uuid = support.import_fresh_module('uuid', fresh=['_uuid']) + def importable(name): try: @@ -14,7 +18,10 @@ def importable(name): except: return False -class TestUUID(unittest.TestCase): + +class BaseTestUUID: + uuid = None + def test_UUID(self): equal = self.assertEqual ascending = [] @@ -28,7 +35,7 @@ def test_UUID(self): (0, 0, 0, 0, 0, 0), 0, 'urn:uuid:00000000-0000-0000-0000-000000000000', - 0, 0, uuid.RESERVED_NCS, None), + 0, 0, self.uuid.RESERVED_NCS, None), ('00010203-0405-0607-0809-0a0b0c0d0e0f', '{00010203-0405-0607-0809-0a0b0c0d0e0f}', '000102030405060708090a0b0c0d0e0f', @@ -37,7 +44,7 @@ def test_UUID(self): (0x00010203, 0x0405, 0x0607, 8, 9, 0x0a0b0c0d0e0f), 0x000102030405060708090a0b0c0d0e0f, 'urn:uuid:00010203-0405-0607-0809-0a0b0c0d0e0f', - 0x607040500010203, 0x809, uuid.RESERVED_NCS, None), + 0x607040500010203, 0x809, self.uuid.RESERVED_NCS, None), ('02d9e6d5-9467-382e-8f9b-9300a64ac3cd', '{02d9e6d5-9467-382e-8f9b-9300a64ac3cd}', '02d9e6d59467382e8f9b9300a64ac3cd', @@ -46,7 +53,7 @@ def test_UUID(self): (0x02d9e6d5, 0x9467, 0x382e, 0x8f, 0x9b, 0x9300a64ac3cd), 0x02d9e6d59467382e8f9b9300a64ac3cd, 'urn:uuid:02d9e6d5-9467-382e-8f9b-9300a64ac3cd', - 0x82e946702d9e6d5, 0xf9b, uuid.RFC_4122, 3), + 0x82e946702d9e6d5, 0xf9b, self.uuid.RFC_4122, 3), ('12345678-1234-5678-1234-567812345678', '{12345678-1234-5678-1234-567812345678}', '12345678123456781234567812345678', @@ -55,7 +62,7 @@ def test_UUID(self): (0x12345678, 0x1234, 0x5678, 0x12, 0x34, 0x567812345678), 0x12345678123456781234567812345678, 'urn:uuid:12345678-1234-5678-1234-567812345678', - 0x678123412345678, 0x1234, uuid.RESERVED_NCS, None), + 0x678123412345678, 0x1234, self.uuid.RESERVED_NCS, None), ('6ba7b810-9dad-11d1-80b4-00c04fd430c8', '{6ba7b810-9dad-11d1-80b4-00c04fd430c8}', '6ba7b8109dad11d180b400c04fd430c8', @@ -64,7 +71,7 @@ def test_UUID(self): (0x6ba7b810, 0x9dad, 0x11d1, 0x80, 0xb4, 0x00c04fd430c8), 0x6ba7b8109dad11d180b400c04fd430c8, 'urn:uuid:6ba7b810-9dad-11d1-80b4-00c04fd430c8', - 0x1d19dad6ba7b810, 0xb4, uuid.RFC_4122, 1), + 0x1d19dad6ba7b810, 0xb4, self.uuid.RFC_4122, 1), ('6ba7b811-9dad-11d1-80b4-00c04fd430c8', '{6ba7b811-9dad-11d1-80b4-00c04fd430c8}', '6ba7b8119dad11d180b400c04fd430c8', @@ -73,7 +80,7 @@ def test_UUID(self): (0x6ba7b811, 0x9dad, 0x11d1, 0x80, 0xb4, 0x00c04fd430c8), 0x6ba7b8119dad11d180b400c04fd430c8, 'urn:uuid:6ba7b811-9dad-11d1-80b4-00c04fd430c8', - 0x1d19dad6ba7b811, 0xb4, uuid.RFC_4122, 1), + 0x1d19dad6ba7b811, 0xb4, self.uuid.RFC_4122, 1), ('6ba7b812-9dad-11d1-80b4-00c04fd430c8', '{6ba7b812-9dad-11d1-80b4-00c04fd430c8}', '6ba7b8129dad11d180b400c04fd430c8', @@ -82,7 +89,7 @@ def test_UUID(self): (0x6ba7b812, 0x9dad, 0x11d1, 0x80, 0xb4, 0x00c04fd430c8), 0x6ba7b8129dad11d180b400c04fd430c8, 'urn:uuid:6ba7b812-9dad-11d1-80b4-00c04fd430c8', - 0x1d19dad6ba7b812, 0xb4, uuid.RFC_4122, 1), + 0x1d19dad6ba7b812, 0xb4, self.uuid.RFC_4122, 1), ('6ba7b814-9dad-11d1-80b4-00c04fd430c8', '{6ba7b814-9dad-11d1-80b4-00c04fd430c8}', '6ba7b8149dad11d180b400c04fd430c8', @@ -91,7 +98,7 @@ def test_UUID(self): (0x6ba7b814, 0x9dad, 0x11d1, 0x80, 0xb4, 0x00c04fd430c8), 0x6ba7b8149dad11d180b400c04fd430c8, 'urn:uuid:6ba7b814-9dad-11d1-80b4-00c04fd430c8', - 0x1d19dad6ba7b814, 0xb4, uuid.RFC_4122, 1), + 0x1d19dad6ba7b814, 0xb4, self.uuid.RFC_4122, 1), ('7d444840-9dc0-11d1-b245-5ffdce74fad2', '{7d444840-9dc0-11d1-b245-5ffdce74fad2}', '7d4448409dc011d1b2455ffdce74fad2', @@ -100,7 +107,7 @@ def test_UUID(self): (0x7d444840, 0x9dc0, 0x11d1, 0xb2, 0x45, 0x5ffdce74fad2), 0x7d4448409dc011d1b2455ffdce74fad2, 'urn:uuid:7d444840-9dc0-11d1-b245-5ffdce74fad2', - 0x1d19dc07d444840, 0x3245, uuid.RFC_4122, 1), + 0x1d19dc07d444840, 0x3245, self.uuid.RFC_4122, 1), ('e902893a-9d22-3c7e-a7b8-d6e313b71d9f', '{e902893a-9d22-3c7e-a7b8-d6e313b71d9f}', 'e902893a9d223c7ea7b8d6e313b71d9f', @@ -109,7 +116,7 @@ def test_UUID(self): (0xe902893a, 0x9d22, 0x3c7e, 0xa7, 0xb8, 0xd6e313b71d9f), 0xe902893a9d223c7ea7b8d6e313b71d9f, 'urn:uuid:e902893a-9d22-3c7e-a7b8-d6e313b71d9f', - 0xc7e9d22e902893a, 0x27b8, uuid.RFC_4122, 3), + 0xc7e9d22e902893a, 0x27b8, self.uuid.RFC_4122, 3), ('eb424026-6f54-4ef8-a4d0-bb658a1fc6cf', '{eb424026-6f54-4ef8-a4d0-bb658a1fc6cf}', 'eb4240266f544ef8a4d0bb658a1fc6cf', @@ -118,7 +125,7 @@ def test_UUID(self): (0xeb424026, 0x6f54, 0x4ef8, 0xa4, 0xd0, 0xbb658a1fc6cf), 0xeb4240266f544ef8a4d0bb658a1fc6cf, 'urn:uuid:eb424026-6f54-4ef8-a4d0-bb658a1fc6cf', - 0xef86f54eb424026, 0x24d0, uuid.RFC_4122, 4), + 0xef86f54eb424026, 0x24d0, self.uuid.RFC_4122, 4), ('f81d4fae-7dec-11d0-a765-00a0c91e6bf6', '{f81d4fae-7dec-11d0-a765-00a0c91e6bf6}', 'f81d4fae7dec11d0a76500a0c91e6bf6', @@ -127,7 +134,7 @@ def test_UUID(self): (0xf81d4fae, 0x7dec, 0x11d0, 0xa7, 0x65, 0x00a0c91e6bf6), 0xf81d4fae7dec11d0a76500a0c91e6bf6, 'urn:uuid:f81d4fae-7dec-11d0-a765-00a0c91e6bf6', - 0x1d07decf81d4fae, 0x2765, uuid.RFC_4122, 1), + 0x1d07decf81d4fae, 0x2765, self.uuid.RFC_4122, 1), ('fffefdfc-fffe-fffe-fffe-fffefdfcfbfa', '{fffefdfc-fffe-fffe-fffe-fffefdfcfbfa}', 'fffefdfcfffefffefffefffefdfcfbfa', @@ -136,7 +143,7 @@ def test_UUID(self): (0xfffefdfc, 0xfffe, 0xfffe, 0xff, 0xfe, 0xfffefdfcfbfa), 0xfffefdfcfffefffefffefffefdfcfbfa, 'urn:uuid:fffefdfc-fffe-fffe-fffe-fffefdfcfbfa', - 0xffefffefffefdfc, 0x3ffe, uuid.RESERVED_FUTURE, None), + 0xffefffefffefdfc, 0x3ffe, self.uuid.RESERVED_FUTURE, None), ('ffffffff-ffff-ffff-ffff-ffffffffffff', '{ffffffff-ffff-ffff-ffff-ffffffffffff}', 'ffffffffffffffffffffffffffffffff', @@ -145,14 +152,14 @@ def test_UUID(self): (0xffffffff, 0xffff, 0xffff, 0xff, 0xff, 0xffffffffffff), 0xffffffffffffffffffffffffffffffff, 'urn:uuid:ffffffff-ffff-ffff-ffff-ffffffffffff', - 0xfffffffffffffff, 0x3fff, uuid.RESERVED_FUTURE, None), + 0xfffffffffffffff, 0x3fff, self.uuid.RESERVED_FUTURE, None), ]: equivalents = [] # Construct each UUID in several different ways. - for u in [uuid.UUID(string), uuid.UUID(curly), uuid.UUID(hex), - uuid.UUID(bytes=bytes), uuid.UUID(bytes_le=bytes_le), - uuid.UUID(fields=fields), uuid.UUID(int=integer), - uuid.UUID(urn)]: + for u in [self.uuid.UUID(string), self.uuid.UUID(curly), self.uuid.UUID(hex), + self.uuid.UUID(bytes=bytes), self.uuid.UUID(bytes_le=bytes_le), + self.uuid.UUID(fields=fields), self.uuid.UUID(int=integer), + self.uuid.UUID(urn)]: # Test all conversions and properties of the UUID object. equal(str(u), string) equal(int(u), integer) @@ -206,64 +213,64 @@ def test_exceptions(self): badtype = lambda f: self.assertRaises(TypeError, f) # Badly formed hex strings. - badvalue(lambda: uuid.UUID('')) - badvalue(lambda: uuid.UUID('abc')) - badvalue(lambda: uuid.UUID('1234567812345678123456781234567')) - badvalue(lambda: uuid.UUID('123456781234567812345678123456789')) - badvalue(lambda: uuid.UUID('123456781234567812345678z2345678')) + badvalue(lambda: self.uuid.UUID('')) + badvalue(lambda: self.uuid.UUID('abc')) + badvalue(lambda: self.uuid.UUID('1234567812345678123456781234567')) + badvalue(lambda: self.uuid.UUID('123456781234567812345678123456789')) + badvalue(lambda: self.uuid.UUID('123456781234567812345678z2345678')) # Badly formed bytes. - badvalue(lambda: uuid.UUID(bytes='abc')) - badvalue(lambda: uuid.UUID(bytes='\0'*15)) - badvalue(lambda: uuid.UUID(bytes='\0'*17)) + badvalue(lambda: self.uuid.UUID(bytes='abc')) + badvalue(lambda: self.uuid.UUID(bytes='\0'*15)) + badvalue(lambda: self.uuid.UUID(bytes='\0'*17)) # Badly formed bytes_le. - badvalue(lambda: uuid.UUID(bytes_le='abc')) - badvalue(lambda: uuid.UUID(bytes_le='\0'*15)) - badvalue(lambda: uuid.UUID(bytes_le='\0'*17)) + badvalue(lambda: self.uuid.UUID(bytes_le='abc')) + badvalue(lambda: self.uuid.UUID(bytes_le='\0'*15)) + badvalue(lambda: self.uuid.UUID(bytes_le='\0'*17)) # Badly formed fields. - badvalue(lambda: uuid.UUID(fields=(1,))) - badvalue(lambda: uuid.UUID(fields=(1, 2, 3, 4, 5))) - badvalue(lambda: uuid.UUID(fields=(1, 2, 3, 4, 5, 6, 7))) + badvalue(lambda: self.uuid.UUID(fields=(1,))) + badvalue(lambda: self.uuid.UUID(fields=(1, 2, 3, 4, 5))) + badvalue(lambda: self.uuid.UUID(fields=(1, 2, 3, 4, 5, 6, 7))) # Field values out of range. - badvalue(lambda: uuid.UUID(fields=(-1, 0, 0, 0, 0, 0))) - badvalue(lambda: uuid.UUID(fields=(0x100000000, 0, 0, 0, 0, 0))) - badvalue(lambda: uuid.UUID(fields=(0, -1, 0, 0, 0, 0))) - badvalue(lambda: uuid.UUID(fields=(0, 0x10000, 0, 0, 0, 0))) - badvalue(lambda: uuid.UUID(fields=(0, 0, -1, 0, 0, 0))) - badvalue(lambda: uuid.UUID(fields=(0, 0, 0x10000, 0, 0, 0))) - badvalue(lambda: uuid.UUID(fields=(0, 0, 0, -1, 0, 0))) - badvalue(lambda: uuid.UUID(fields=(0, 0, 0, 0x100, 0, 0))) - badvalue(lambda: uuid.UUID(fields=(0, 0, 0, 0, -1, 0))) - badvalue(lambda: uuid.UUID(fields=(0, 0, 0, 0, 0x100, 0))) - badvalue(lambda: uuid.UUID(fields=(0, 0, 0, 0, 0, -1))) - badvalue(lambda: uuid.UUID(fields=(0, 0, 0, 0, 0, 0x1000000000000))) + badvalue(lambda: self.uuid.UUID(fields=(-1, 0, 0, 0, 0, 0))) + badvalue(lambda: self.uuid.UUID(fields=(0x100000000, 0, 0, 0, 0, 0))) + badvalue(lambda: self.uuid.UUID(fields=(0, -1, 0, 0, 0, 0))) + badvalue(lambda: self.uuid.UUID(fields=(0, 0x10000, 0, 0, 0, 0))) + badvalue(lambda: self.uuid.UUID(fields=(0, 0, -1, 0, 0, 0))) + badvalue(lambda: self.uuid.UUID(fields=(0, 0, 0x10000, 0, 0, 0))) + badvalue(lambda: self.uuid.UUID(fields=(0, 0, 0, -1, 0, 0))) + badvalue(lambda: self.uuid.UUID(fields=(0, 0, 0, 0x100, 0, 0))) + badvalue(lambda: self.uuid.UUID(fields=(0, 0, 0, 0, -1, 0))) + badvalue(lambda: self.uuid.UUID(fields=(0, 0, 0, 0, 0x100, 0))) + badvalue(lambda: self.uuid.UUID(fields=(0, 0, 0, 0, 0, -1))) + badvalue(lambda: self.uuid.UUID(fields=(0, 0, 0, 0, 0, 0x1000000000000))) # Version number out of range. - badvalue(lambda: uuid.UUID('00'*16, version=0)) - badvalue(lambda: uuid.UUID('00'*16, version=6)) + badvalue(lambda: self.uuid.UUID('00'*16, version=0)) + badvalue(lambda: self.uuid.UUID('00'*16, version=6)) # Integer value out of range. - badvalue(lambda: uuid.UUID(int=-1)) - badvalue(lambda: uuid.UUID(int=1<<128)) + badvalue(lambda: self.uuid.UUID(int=-1)) + badvalue(lambda: self.uuid.UUID(int=1<<128)) # Must supply exactly one of hex, bytes, fields, int. h, b, f, i = '00'*16, b'\0'*16, (0, 0, 0, 0, 0, 0), 0 - uuid.UUID(h) - uuid.UUID(hex=h) - uuid.UUID(bytes=b) - uuid.UUID(bytes_le=b) - uuid.UUID(fields=f) - uuid.UUID(int=i) + self.uuid.UUID(h) + self.uuid.UUID(hex=h) + self.uuid.UUID(bytes=b) + self.uuid.UUID(bytes_le=b) + self.uuid.UUID(fields=f) + self.uuid.UUID(int=i) # Wrong number of arguments (positional). - badtype(lambda: uuid.UUID()) - badtype(lambda: uuid.UUID(h, b)) - badtype(lambda: uuid.UUID(h, b, b)) - badtype(lambda: uuid.UUID(h, b, b, f)) - badtype(lambda: uuid.UUID(h, b, b, f, i)) + badtype(lambda: self.uuid.UUID()) + badtype(lambda: self.uuid.UUID(h, b)) + badtype(lambda: self.uuid.UUID(h, b, b)) + badtype(lambda: self.uuid.UUID(h, b, b, f)) + badtype(lambda: self.uuid.UUID(h, b, b, f, i)) # Duplicate arguments. for hh in [[], [('hex', h)]]: @@ -273,12 +280,12 @@ def test_exceptions(self): for ff in [[], [('fields', f)]]: args = dict(hh + bb + bble + ii + ff) if len(args) != 0: - badtype(lambda: uuid.UUID(h, **args)) + badtype(lambda: self.uuid.UUID(h, **args)) if len(args) != 1: - badtype(lambda: uuid.UUID(**args)) + badtype(lambda: self.uuid.UUID(**args)) # Immutability. - u = uuid.UUID(h) + u = self.uuid.UUID(h) badtype(lambda: setattr(u, 'hex', h)) badtype(lambda: setattr(u, 'bytes', b)) badtype(lambda: setattr(u, 'bytes_le', b)) @@ -297,122 +304,135 @@ def test_exceptions(self): badtype(lambda: u > object()) def test_getnode(self): - node1 = uuid.getnode() + node1 = self.uuid.getnode() self.assertTrue(0 < node1 < (1 << 48), '%012x' % node1) # Test it again to ensure consistency. - node2 = uuid.getnode() + node2 = self.uuid.getnode() self.assertEqual(node1, node2, '%012x != %012x' % (node1, node2)) - @unittest.skipUnless(importable('ctypes'), 'requires ctypes') def test_uuid1(self): equal = self.assertEqual # Make sure uuid1() generates UUIDs that are actually version 1. - for u in [uuid.uuid1() for i in range(10)]: - equal(u.variant, uuid.RFC_4122) + for u in [self.uuid.uuid1() for i in range(10)]: + equal(u.variant, self.uuid.RFC_4122) equal(u.version, 1) + self.assertIn(u.is_safe, {self.uuid.SafeUUID.safe, + self.uuid.SafeUUID.unsafe, + self.uuid.SafeUUID.unknown}) # Make sure the generated UUIDs are actually unique. uuids = {} - for u in [uuid.uuid1() for i in range(1000)]: + for u in [self.uuid.uuid1() for i in range(1000)]: uuids[u] = 1 equal(len(uuids.keys()), 1000) # Make sure the supplied node ID appears in the UUID. - u = uuid.uuid1(0) + u = self.uuid.uuid1(0) equal(u.node, 0) - u = uuid.uuid1(0x123456789abc) + u = self.uuid.uuid1(0x123456789abc) equal(u.node, 0x123456789abc) - u = uuid.uuid1(0xffffffffffff) + u = self.uuid.uuid1(0xffffffffffff) equal(u.node, 0xffffffffffff) # Make sure the supplied clock sequence appears in the UUID. - u = uuid.uuid1(0x123456789abc, 0) + u = self.uuid.uuid1(0x123456789abc, 0) equal(u.node, 0x123456789abc) equal(((u.clock_seq_hi_variant & 0x3f) << 8) | u.clock_seq_low, 0) - u = uuid.uuid1(0x123456789abc, 0x1234) + u = self.uuid.uuid1(0x123456789abc, 0x1234) equal(u.node, 0x123456789abc) equal(((u.clock_seq_hi_variant & 0x3f) << 8) | u.clock_seq_low, 0x1234) - u = uuid.uuid1(0x123456789abc, 0x3fff) + u = self.uuid.uuid1(0x123456789abc, 0x3fff) equal(u.node, 0x123456789abc) equal(((u.clock_seq_hi_variant & 0x3f) << 8) | u.clock_seq_low, 0x3fff) - requires_ugt = unittest.skipUnless(uuid._uuid_generate_time is not None, - 'requires uuid_generate_time_safe(3)') - - @requires_ugt - # bpo-29925: On Mac OS X Tiger, uuid.uuid1().is_safe returns - # uuid.SafeUUID.unknown + # bpo-29925: On Mac OS X Tiger, self.uuid.uuid1().is_safe returns + # self.uuid.SafeUUID.unknown @support.requires_mac_ver(10, 5) + @unittest.skipUnless(os.name == 'posix', 'POSIX-only test') def test_uuid1_safe(self): - u = uuid.uuid1() + if not self.uuid._has_uuid_generate_time_safe: + self.skipTest('requires uuid_generate_time_safe(3)') + + u = self.uuid.uuid1() # uuid_generate_time_safe() may return 0 or -1 but what it returns is # dependent on the underlying platform support. At least it cannot be # unknown (unless I suppose the platform is buggy). - self.assertNotEqual(u.is_safe, uuid.SafeUUID.unknown) - - @requires_ugt + self.assertNotEqual(u.is_safe, self.uuid.SafeUUID.unknown) + + @contextlib.contextmanager + def mock_generate_time_safe(self, safe_value): + """ + Mock uuid._generate_time_safe() to return a given *safe_value*. + """ + if os.name != 'posix': + self.skipTest('POSIX-only test') + self.uuid._load_system_functions() + f = self.uuid._generate_time_safe + if f is None: + self.skipTest('need uuid._generate_time_safe') + with unittest.mock.patch.object(self.uuid, '_generate_time_safe', + lambda: (f()[0], safe_value)): + yield + + @unittest.skipUnless(os.name == 'posix', 'POSIX-only test') def test_uuid1_unknown(self): # Even if the platform has uuid_generate_time_safe(), let's mock it to # be uuid_generate_time() and ensure the safety is unknown. - with unittest.mock.patch.object(uuid._uuid_generate_time, - 'restype', None): - u = uuid.uuid1() - self.assertEqual(u.is_safe, uuid.SafeUUID.unknown) + with self.mock_generate_time_safe(None): + u = self.uuid.uuid1() + self.assertEqual(u.is_safe, self.uuid.SafeUUID.unknown) - @requires_ugt + @unittest.skipUnless(os.name == 'posix', 'POSIX-only test') def test_uuid1_is_safe(self): - with unittest.mock.patch.object(uuid._uuid_generate_time, - 'restype', lambda x: 0): - u = uuid.uuid1() - self.assertEqual(u.is_safe, uuid.SafeUUID.safe) + with self.mock_generate_time_safe(0): + u = self.uuid.uuid1() + self.assertEqual(u.is_safe, self.uuid.SafeUUID.safe) - @requires_ugt + @unittest.skipUnless(os.name == 'posix', 'POSIX-only test') def test_uuid1_is_unsafe(self): - with unittest.mock.patch.object(uuid._uuid_generate_time, - 'restype', lambda x: -1): - u = uuid.uuid1() - self.assertEqual(u.is_safe, uuid.SafeUUID.unsafe) + with self.mock_generate_time_safe(-1): + u = self.uuid.uuid1() + self.assertEqual(u.is_safe, self.uuid.SafeUUID.unsafe) - @requires_ugt + @unittest.skipUnless(os.name == 'posix', 'POSIX-only test') def test_uuid1_bogus_return_value(self): - with unittest.mock.patch.object(uuid._uuid_generate_time, - 'restype', lambda x: 3): - u = uuid.uuid1() - self.assertEqual(u.is_safe, uuid.SafeUUID.unknown) + with self.mock_generate_time_safe(3): + u = self.uuid.uuid1() + self.assertEqual(u.is_safe, self.uuid.SafeUUID.unknown) def test_uuid3(self): equal = self.assertEqual # Test some known version-3 UUIDs. - for u, v in [(uuid.uuid3(uuid.NAMESPACE_DNS, 'python.org'), + for u, v in [(self.uuid.uuid3(self.uuid.NAMESPACE_DNS, 'python.org'), '6fa459ea-ee8a-3ca4-894e-db77e160355e'), - (uuid.uuid3(uuid.NAMESPACE_URL, 'http://python.org/'), + (self.uuid.uuid3(self.uuid.NAMESPACE_URL, 'http://python.org/'), '9fe8e8c4-aaa8-32a9-a55c-4535a88b748d'), - (uuid.uuid3(uuid.NAMESPACE_OID, '1.3.6.1'), + (self.uuid.uuid3(self.uuid.NAMESPACE_OID, '1.3.6.1'), 'dd1a1cef-13d5-368a-ad82-eca71acd4cd1'), - (uuid.uuid3(uuid.NAMESPACE_X500, 'c=ca'), + (self.uuid.uuid3(self.uuid.NAMESPACE_X500, 'c=ca'), '658d3002-db6b-3040-a1d1-8ddd7d189a4d'), ]: - equal(u.variant, uuid.RFC_4122) + equal(u.variant, self.uuid.RFC_4122) equal(u.version, 3) - equal(u, uuid.UUID(v)) + equal(u, self.uuid.UUID(v)) equal(str(u), v) def test_uuid4(self): equal = self.assertEqual # Make sure uuid4() generates UUIDs that are actually version 4. - for u in [uuid.uuid4() for i in range(10)]: - equal(u.variant, uuid.RFC_4122) + for u in [self.uuid.uuid4() for i in range(10)]: + equal(u.variant, self.uuid.RFC_4122) equal(u.version, 4) # Make sure the generated UUIDs are actually unique. uuids = {} - for u in [uuid.uuid4() for i in range(1000)]: + for u in [self.uuid.uuid4() for i in range(1000)]: uuids[u] = 1 equal(len(uuids.keys()), 1000) @@ -420,44 +440,54 @@ def test_uuid5(self): equal = self.assertEqual # Test some known version-5 UUIDs. - for u, v in [(uuid.uuid5(uuid.NAMESPACE_DNS, 'python.org'), + for u, v in [(self.uuid.uuid5(self.uuid.NAMESPACE_DNS, 'python.org'), '886313e1-3b8a-5372-9b90-0c9aee199e5d'), - (uuid.uuid5(uuid.NAMESPACE_URL, 'http://python.org/'), + (self.uuid.uuid5(self.uuid.NAMESPACE_URL, 'http://python.org/'), '4c565f0d-3f5a-5890-b41b-20cf47701c5e'), - (uuid.uuid5(uuid.NAMESPACE_OID, '1.3.6.1'), + (self.uuid.uuid5(self.uuid.NAMESPACE_OID, '1.3.6.1'), '1447fa61-5277-5fef-a9b3-fbc6e44f4af3'), - (uuid.uuid5(uuid.NAMESPACE_X500, 'c=ca'), + (self.uuid.uuid5(self.uuid.NAMESPACE_X500, 'c=ca'), 'cc957dd1-a972-5349-98cd-874190002798'), ]: - equal(u.variant, uuid.RFC_4122) + equal(u.variant, self.uuid.RFC_4122) equal(u.version, 5) - equal(u, uuid.UUID(v)) + equal(u, self.uuid.UUID(v)) equal(str(u), v) @unittest.skipUnless(os.name == 'posix', 'requires Posix') def testIssue8621(self): - # On at least some versions of OSX uuid.uuid4 generates + # On at least some versions of OSX self.uuid.uuid4 generates # the same sequence of UUIDs in the parent and any # children started using fork. fds = os.pipe() pid = os.fork() if pid == 0: os.close(fds[0]) - value = uuid.uuid4() + value = self.uuid.uuid4() os.write(fds[1], value.hex.encode('latin-1')) os._exit(0) else: os.close(fds[1]) self.addCleanup(os.close, fds[0]) - parent_value = uuid.uuid4().hex + parent_value = self.uuid.uuid4().hex os.waitpid(pid, 0) child_value = os.read(fds[0], 100).decode('latin-1') self.assertNotEqual(parent_value, child_value) -class TestInternals(unittest.TestCase): +class TestUUIDWithoutExtModule(BaseTestUUID, unittest.TestCase): + uuid = py_uuid + +(a)unittest.skipUnless(c_uuid, 'requires the C _uuid module') +class TestUUIDWithExtModule(BaseTestUUID, unittest.TestCase): + uuid = c_uuid + + +class BaseTestInternals: + uuid = None + @unittest.skipUnless(os.name == 'posix', 'requires Posix') def test_find_mac(self): data = ''' @@ -473,7 +503,7 @@ def test_find_mac(self): return_value='/sbin/ifconfig'): with unittest.mock.patch.object(subprocess, 'Popen', return_value=popen): - mac = uuid._find_mac( + mac = self.uuid._find_mac( command='ifconfig', args='', hw_identifiers=[b'hwaddr'], @@ -497,61 +527,70 @@ def check_node(self, node, requires=None, network=False): @unittest.skipUnless(os.name == 'posix', 'requires Posix') def test_ifconfig_getnode(self): - node = uuid._ifconfig_getnode() + node = self.uuid._ifconfig_getnode() self.check_node(node, 'ifconfig', True) @unittest.skipUnless(os.name == 'posix', 'requires Posix') def test_ip_getnode(self): - node = uuid._ip_getnode() + node = self.uuid._ip_getnode() self.check_node(node, 'ip', True) @unittest.skipUnless(os.name == 'posix', 'requires Posix') def test_arp_getnode(self): - node = uuid._arp_getnode() + node = self.uuid._arp_getnode() self.check_node(node, 'arp', True) @unittest.skipUnless(os.name == 'posix', 'requires Posix') def test_lanscan_getnode(self): - node = uuid._lanscan_getnode() + node = self.uuid._lanscan_getnode() self.check_node(node, 'lanscan', True) @unittest.skipUnless(os.name == 'posix', 'requires Posix') def test_netstat_getnode(self): - node = uuid._netstat_getnode() + node = self.uuid._netstat_getnode() self.check_node(node, 'netstat', True) @unittest.skipUnless(os.name == 'nt', 'requires Windows') def test_ipconfig_getnode(self): - node = uuid._ipconfig_getnode() + node = self.uuid._ipconfig_getnode() self.check_node(node, 'ipconfig', True) @unittest.skipUnless(importable('win32wnet'), 'requires win32wnet') @unittest.skipUnless(importable('netbios'), 'requires netbios') def test_netbios_getnode(self): - node = uuid._netbios_getnode() + node = self.uuid._netbios_getnode() self.check_node(node, network=True) def test_random_getnode(self): - node = uuid._random_getnode() + node = self.uuid._random_getnode() # Least significant bit of first octet must be set. self.assertTrue(node & 0x010000000000, '%012x' % node) self.check_node(node) @unittest.skipUnless(os.name == 'posix', 'requires Posix') - @unittest.skipUnless(importable('ctypes'), 'requires ctypes') - def test_unixdll_getnode(self): + def test_unix_getnode(self): + if not importable('_uuid') and not importable('ctypes'): + self.skipTest("neither _uuid extension nor ctypes available") try: # Issues 1481, 3581: _uuid_generate_time() might be None. - node = uuid._unixdll_getnode() + node = self.uuid._unix_getnode() except TypeError: self.skipTest('requires uuid_generate_time') - self.check_node(node) + self.check_node(node, 'unix') @unittest.skipUnless(os.name == 'nt', 'requires Windows') @unittest.skipUnless(importable('ctypes'), 'requires ctypes') def test_windll_getnode(self): - node = uuid._windll_getnode() + node = self.uuid._windll_getnode() self.check_node(node) +class TestInternalsWithoutExtModule(BaseTestInternals, unittest.TestCase): + uuid = py_uuid + +(a)unittest.skipUnless(c_uuid, 'requires the C _uuid module') +class TestInternalsWithExtModule(BaseTestInternals, unittest.TestCase): + uuid = c_uuid + + if __name__ == '__main__': unittest.main() diff --git a/Lib/uuid.py b/Lib/uuid.py index 15a81f5c18b..b2fbd38c353 100644 --- a/Lib/uuid.py +++ b/Lib/uuid.py @@ -45,6 +45,7 @@ """ import os +import sys from enum import Enum @@ -475,73 +476,112 @@ def _netbios_getnode(): continue return int.from_bytes(bytes, 'big') -# Thanks to Thomas Heller for ctypes and for his help with its use here. -# If ctypes is available, use it to find system routines for UUID generation. -# XXX This makes the module non-thread-safe! -_uuid_generate_time = _UuidCreate = None +_generate_time_safe = _UuidCreate = None +_has_uuid_generate_time_safe = None + +# Import optional C extension at toplevel, to help disabling it when testing try: - import ctypes, ctypes.util - import sys - - # The uuid_generate_* routines are provided by libuuid on at least - # Linux and FreeBSD, and provided by libc on Mac OS X. - _libnames = ['uuid'] - if not sys.platform.startswith('win'): - _libnames.append('c') - for libname in _libnames: - try: - lib = ctypes.CDLL(ctypes.util.find_library(libname)) - except Exception: # pragma: nocover - continue - # Try to find the safe variety first. - if hasattr(lib, 'uuid_generate_time_safe'): - _uuid_generate_time = lib.uuid_generate_time_safe - # int uuid_generate_time_safe(uuid_t out); - break - elif hasattr(lib, 'uuid_generate_time'): # pragma: nocover - _uuid_generate_time = lib.uuid_generate_time - # void uuid_generate_time(uuid_t out); - _uuid_generate_time.restype = None - break - del _libnames - - # The uuid_generate_* functions are broken on MacOS X 10.5, as noted - # in issue #8621 the function generates the same sequence of values - # in the parent process and all children created using fork (unless - # those children use exec as well). - # - # Assume that the uuid_generate functions are broken from 10.5 onward, - # the test can be adjusted when a later version is fixed. - if sys.platform == 'darwin': - if int(os.uname().release.split('.')[0]) >= 9: - _uuid_generate_time = None - - # On Windows prior to 2000, UuidCreate gives a UUID containing the - # hardware address. On Windows 2000 and later, UuidCreate makes a - # random UUID and UuidCreateSequential gives a UUID containing the - # hardware address. These routines are provided by the RPC runtime. - # NOTE: at least on Tim's WinXP Pro SP2 desktop box, while the last - # 6 bytes returned by UuidCreateSequential are fixed, they don't appear - # to bear any relationship to the MAC address of any network device - # on the box. + import _uuid +except ImportError: + _uuid = None + + +def _load_system_functions(): + """ + Try to load platform-specific functions for generating uuids. + """ + global _generate_time_safe, _UuidCreate, _has_uuid_generate_time_safe + + if _has_uuid_generate_time_safe is not None: + return + + _has_uuid_generate_time_safe = False + + if sys.platform == "darwin" and int(os.uname().release.split('.')[0]) < 9: + # The uuid_generate_* functions are broken on MacOS X 10.5, as noted + # in issue #8621 the function generates the same sequence of values + # in the parent process and all children created using fork (unless + # those children use exec as well). + # + # Assume that the uuid_generate functions are broken from 10.5 onward, + # the test can be adjusted when a later version is fixed. + pass + elif _uuid is not None: + _generate_time_safe = _uuid.generate_time_safe + _has_uuid_generate_time_safe = True + return + try: - lib = ctypes.windll.rpcrt4 - except: - lib = None - _UuidCreate = getattr(lib, 'UuidCreateSequential', - getattr(lib, 'UuidCreate', None)) -except: - pass - -def _unixdll_getnode(): - """Get the hardware address on Unix using ctypes.""" - _buffer = ctypes.create_string_buffer(16) - _uuid_generate_time(_buffer) - return UUID(bytes=bytes_(_buffer.raw)).node + # If we couldn't find an extension module, try ctypes to find + # system routines for UUID generation. + # Thanks to Thomas Heller for ctypes and for his help with its use here. + import ctypes + import ctypes.util + + # The uuid_generate_* routines are provided by libuuid on at least + # Linux and FreeBSD, and provided by libc on Mac OS X. + _libnames = ['uuid'] + if not sys.platform.startswith('win'): + _libnames.append('c') + for libname in _libnames: + try: + lib = ctypes.CDLL(ctypes.util.find_library(libname)) + except Exception: # pragma: nocover + continue + # Try to find the safe variety first. + if hasattr(lib, 'uuid_generate_time_safe'): + _uuid_generate_time_safe = lib.uuid_generate_time_safe + # int uuid_generate_time_safe(uuid_t out); + def _generate_time_safe(): + _buffer = ctypes.create_string_buffer(16) + res = _uuid_generate_time_safe(_buffer) + return bytes(_buffer.raw), res + _has_uuid_generate_time_safe = True + break + + elif hasattr(lib, 'uuid_generate_time'): # pragma: nocover + _uuid_generate_time = lib.uuid_generate_time + # void uuid_generate_time(uuid_t out); + _uuid_generate_time.restype = None + def _generate_time_safe(): + _buffer = ctypes.create_string_buffer(16) + _uuid_generate_time(_buffer) + return bytes(_buffer.raw), None + break + + # On Windows prior to 2000, UuidCreate gives a UUID containing the + # hardware address. On Windows 2000 and later, UuidCreate makes a + # random UUID and UuidCreateSequential gives a UUID containing the + # hardware address. These routines are provided by the RPC runtime. + # NOTE: at least on Tim's WinXP Pro SP2 desktop box, while the last + # 6 bytes returned by UuidCreateSequential are fixed, they don't appear + # to bear any relationship to the MAC address of any network device + # on the box. + try: + lib = ctypes.windll.rpcrt4 + except: + lib = None + _UuidCreate = getattr(lib, 'UuidCreateSequential', + getattr(lib, 'UuidCreate', None)) + + except Exception as exc: + import warnings + warnings.warn(f"Could not find fallback ctypes uuid functions: {exc}", + ImportWarning) + + +def _unix_getnode(): + """Get the hardware address on Unix using the _uuid extension module + or ctypes.""" + _load_system_functions() + uuid_time, _ = _generate_time_safe() + return UUID(bytes=uuid_time).node def _windll_getnode(): """Get the hardware address on Windows using ctypes.""" + import ctypes + _load_system_functions() _buffer = ctypes.create_string_buffer(16) if _UuidCreate(_buffer) == 0: return UUID(bytes=bytes_(_buffer.raw)).node @@ -551,6 +591,7 @@ def _random_getnode(): import random return random.getrandbits(48) | 0x010000000000 + _node = None def getnode(): @@ -561,16 +602,14 @@ def getnode(): choose a random 48-bit number with its eighth bit set to 1 as recommended in RFC 4122. """ - global _node if _node is not None: return _node - import sys if sys.platform == 'win32': getters = [_windll_getnode, _netbios_getnode, _ipconfig_getnode] else: - getters = [_unixdll_getnode, _ifconfig_getnode, _ip_getnode, + getters = [_unix_getnode, _ifconfig_getnode, _ip_getnode, _arp_getnode, _lanscan_getnode, _netstat_getnode] for getter in getters + [_random_getnode]: @@ -581,6 +620,7 @@ def getnode(): if _node is not None: return _node + _last_timestamp = None def uuid1(node=None, clock_seq=None): @@ -591,14 +631,14 @@ def uuid1(node=None, clock_seq=None): # When the system provides a version-1 UUID generator, use it (but don't # use UuidCreate here because its UUIDs don't conform to RFC 4122). - if _uuid_generate_time and node is clock_seq is None: - _buffer = ctypes.create_string_buffer(16) - safely_generated = _uuid_generate_time(_buffer) + _load_system_functions() + if _generate_time_safe is not None and node is clock_seq is None: + uuid_time, safely_generated = _generate_time_safe() try: is_safe = SafeUUID(safely_generated) except ValueError: is_safe = SafeUUID.unknown - return UUID(bytes=bytes_(_buffer.raw), is_safe=is_safe) + return UUID(bytes=uuid_time, is_safe=is_safe) global _last_timestamp import time diff --git a/Misc/NEWS.d/next/Library/2017-09-28-13-17-33.bpo-20519.FteeQQ.rst b/Misc/NEWS.d/next/Library/2017-09-28-13-17-33.bpo-20519.FteeQQ.rst new file mode 100644 index 00000000000..ef86c47f26a --- /dev/null +++ b/Misc/NEWS.d/next/Library/2017-09-28-13-17-33.bpo-20519.FteeQQ.rst @@ -0,0 +1 @@ +Avoid ctypes use (if possible) and improve import time for uuid. diff --git a/Modules/_uuidmodule.c b/Modules/_uuidmodule.c new file mode 100644 index 00000000000..e263b40d8ff --- /dev/null +++ b/Modules/_uuidmodule.c @@ -0,0 +1,35 @@ +#define PY_SSIZE_T_CLEAN + +#include "Python.h" +#include <uuid/uuid.h> + + +static PyObject * +py_uuid_generate_time_safe(void) +{ + uuid_t out; + int res; + + res = uuid_generate_time_safe(out); + return Py_BuildValue("y#i", (const char *) out, sizeof(out), res); +} + + +static PyMethodDef uuid_methods[] = { + {"generate_time_safe", (PyCFunction) py_uuid_generate_time_safe, METH_NOARGS, NULL}, + {NULL, NULL, 0, NULL} /* sentinel */ +}; + +static struct PyModuleDef uuidmodule = { + PyModuleDef_HEAD_INIT, + .m_name = "_uuid", + .m_size = -1, + .m_methods = uuid_methods, +}; + +PyMODINIT_FUNC +PyInit__uuid(void) +{ + assert(sizeof(uuid_t) == 16); + return PyModule_Create(&uuidmodule); +} diff --git a/setup.py b/setup.py index d5c58e06869..0b536c8ca32 100644 --- a/setup.py +++ b/setup.py @@ -1668,6 +1668,20 @@ class db_found(Exception): pass if '_tkinter' not in [e.name for e in self.extensions]: missing.append('_tkinter') + # Build the _uuid module if possible + uuid_incs = find_file("uuid.h", inc_dirs, ["/usr/include/uuid"]) + if uuid_incs: + if self.compiler.find_library_file(lib_dirs, 'uuid'): + uuid_libs = ['uuid'] + else: + uuid_libs = [] + if uuid_incs: + self.extensions.append(Extension('_uuid', ['_uuidmodule.c'], + libraries=uuid_libs, + include_dirs=uuid_incs)) + else: + missing.append('_uuid') + ## # Uncomment these lines if you want to play with xxmodule.c ## ext = Extension('xx', ['xxmodule.c']) ## self.extensions.append(ext) [View Less]

1 0