Mailman 3 August 2015 - Python-checkins

peps: Add Paul Moore as Delegate, remove Data Sovereignty section, add Opposition
by donald.stufft Aug. 29, 2015

Aug. 29, 2015

https://hg.python.org/peps/rev/8cc94276db23 changeset: 6007:8cc94276db23 parent: 5996:6c8a8f29a798 user: Donald Stufft <donald(a)stufft.io> date: Sat Aug 29 10:40:20 2015 -0400 summary: Add Paul Moore as Delegate, remove Data Sovereignty section, add Opposition section files: pep-0470.txt | 49 +++++++++++++++++++++++---------------- 1 files changed, 29 insertions(+), 20 deletions(-) diff --git a/pep-0470.txt b/pep-0470.txt --- a/pep-0470.txt +++ b/pep-0470.txt @@ -2,8 +2,8 @@ Title: Removing External Hosting Support on PyPI Version: $Revision$ Last-Modified: $Date$ -Author: Donald Stufft <donald(a)stufft.io>, -BDFL-Delegate: TBD +Author: Donald Stufft <donald(a)stufft.io> +BDFL-Delegate: Paul Moore <p.f.moore(a)gmail.com> Discussions-To: distutils-sig(a)python.org Status: Draft Type: Process @@ -284,26 +284,35 @@ Remote Code Execution via a Man In The Middle attack. -Data Sovereignty -================ +Opposition +========== -In the discussions around previous versions of this PEP, one of the key use -cases for wanting to host files externally to PyPI was due to data sovereignty -requirements for people living in jurisdictions outside of the USA, where PyPI -is currently hosted. The author of this PEP is not blind to these concerns and -realizes that this PEP represents a regression for the people that have these -concerns, however the current situation is presenting an extremely poor user -experience and the feature is only being used by a small percentage of -projects. In addition, the data sovereignty problems requires familarity with -the laws outside of the home jurisdiction of the author of this PEP, who is -also the principal developer and operator of PyPI. For these reasons, a -solution for the problem of data sovereignty has been deferred and is -considered outside of the scope for this PEP. +The primary opposition to this PEP is that some people may want to not host on +PyPI for any number of reasons such as the PyPI Terms of Service or Data +Sovereignty requirements for a particular jurisdiction. For these people this +PEP represents a regression in the ability for end users to discover what +options are required to install their projects. -The data sovereignty issue will need to be addressed by someone with an -understanding of the restrictions and constraints involved. As the author of -this PEP does not have that expertise, it should be addressed in a separate -PEP. +The projects that are currently unwilling to host on PyPI can be split into +two general categories, those that would be willing to host on PyPI but for +some particular missing feature, and those that will never be willing to host +on PyPI for any reason. + +It is the opinion of this PEP that for those who will never be willing to host +on PyPI for any reason, that those projects should rely on the support of +multiple repositories that pip and setuptools already possess and which this +PEP recommends to all installers. These projects may still use PyPI as an index +for users to discover through the web interface and should document what +options are needed in order to install within the long description of their +projects, which is a freeform field which can structure the information however +is most useful for their particular project. This is a model which is battle +tested in virtually every Linux distribution. + +For the projects that would host on PyPI but for some particular missing +feature, it is the opinion of this PEP that instead of the legacy feature that +this PEP aims to remove, they would be be best served by identifying which +features are missing and then designing a good solution for those particular +issues. Rejected Proposals -- Repository URL: https://hg.python.org/peps

1 0

peps (merge default -> default): merge
by donald.stufft Aug. 29, 2015

Aug. 29, 2015

https://hg.python.org/peps/rev/036f89f3cea8 changeset: 6008:036f89f3cea8 parent: 6007:8cc94276db23 parent: 6006:9af8765a7661 user: Donald Stufft <donald(a)stufft.io> date: Sat Aug 29 10:40:35 2015 -0400 summary: merge files: pep-0498.txt | 91 ++++++++++++++++++++++++++++++++++++--- pep-0501.txt | 2 +- 2 files changed, 85 insertions(+), 8 deletions(-) diff --git a/pep-0498.txt b/pep-0498.txt --- a/pep-0498.txt +++ b/pep-0498.txt @@ -208,6 +208,25 @@ brackets, or braces. The exception is that the '!=' operator is special cased. +Escape sequences +---------------- + +Scanning an f-string for expressions happens after escape sequences +are decoded. Because hex(ord('{')) == 0x7b, the f-string +f'\\u007b4*10}' is decoded to f'{4*10}', which evaluates as the integer +40:: + + >>> f'\u007b4*10}' + '40' + >>> f'\x7b4*10}' + '40' + >>> f'\x7b4*10\N{RIGHT CURLY BRACKET}' + '40' + +These examples aren't generally useful, they're just to show that +escape sequences are processed before f-strings are parsed for +expressions. + Code equivalence ---------------- @@ -360,6 +379,25 @@ For ease of readability, leading and trailing whitespace in expressions is ignored. +Evaluation order of expressions +------------------------------- + +The expressions in an f-string are evaluated in left-to-right +order. This is detectable only if the expressions have side effects:: + + >>> def fn(l, incr): + ... result = l[0] + ... l[0] += incr + ... return result + ... + >>> lst = [0] + >>> f'{fn(lst,2)} {fn(lst,3)}' + '0 2' + >>> f'{fn(lst,2)} {fn(lst,3)}' + '5 7' + >>> lst + [10] + Discussion ========== @@ -403,7 +441,7 @@ of uses of string.Template, but hundreds of uses of str.format(). Another proposed alternative was to have the substituted text between -\{ and } or between \{ and \}. While this syntax would probably be +\\{ and } or between \\{ and \\}. While this syntax would probably be desirable if all string literals were to support interpolation, this PEP only supports strings that are already marked with the leading 'f'. As such, the PEP is using unadorned braces to denoted substituted @@ -473,6 +511,15 @@ See [#]_ for a further discussion. It was this observation that led to full Python expressions being supported in f-strings. +Furthermore, the limited expressions that str.format() understands +need not be valid Python expressions. For example:: + + >>> '{i[";]}'.format(i={'";':4}) + '4' + +For this reason, the str.format() "expression parser" is not suitable +for use when implementing f-strings. + Triple-quoted f-strings ----------------------- @@ -593,15 +640,45 @@ f'{x:.{width}}' -Expressions with side effects ------------------------------ +The same expression used multiple times +--------------------------------------- -xxx +Every expression in braces in an f-string is evaluated exactly +once. If the same expression is used more than once in the same +f-string, it will be evaluated multiple times. However, it's undefined +which result will show up in the resulting string value. For purposes +of this section, two expressions are the same if they have the exact +same literal text defining them. For example, '{i}' and '{i}' are the +same expression, but '{i}' and '{ i}' are not, due to the extra space +in the second expression. -Expressions used multiple times -------------------------------- +For example, given:: -xxx + >>> def fn(lst): + ... lst[0] += 1 + ... return lst[0] + ... + >>> lst=[0] + >>> f'{fn(lst)} {fn(lst)}' + '1 2' + +The resulting f-string might have the value '1 2', '2 2', '1 1', or +even '2 1'. + +However:: + + >>> lst=[0] + >>> f'{fn(lst)} { fn(lst)}' + '1 2' + +This f-string will always have the value '1 2'. This is due to the two +expressions not being the same: the space in the second example makes +the two expressions distinct. + +This restriction is in place in order to allow for a possible future +extension allowing translated strings, wherein the expression +substitutions would be identified by their text values as they show up +between the braces. References ========== diff --git a/pep-0501.txt b/pep-0501.txt --- a/pep-0501.txt +++ b/pep-0501.txt @@ -166,7 +166,7 @@ __slots__ = ("raw_template", "parsed_fields", "field_values") def __new__(cls, raw_template, parsed_fields, field_values): - self = super().__new__() + self = super().__new__(cls) self.raw_template = raw_template self.parsed_fields = parsed_fields self.field_values = field_values -- Repository URL: https://hg.python.org/peps

1 0

cpython (2.7): Issue #24953: Include ICC version in sys.version string when bulit with ICC on
by zach.ware Aug. 29, 2015

Aug. 29, 2015

https://hg.python.org/cpython/rev/3639520c3fe9 changeset: 97538:3639520c3fe9 branch: 2.7 parent: 97525:514f5d610175 user: Zachary Ware <zachary.ware(a)gmail.com> date: Fri Aug 28 23:52:31 2015 -0500 summary: Issue #24953: Include ICC version in sys.version string when bulit with ICC on Windows files: PC/pyconfig.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/PC/pyconfig.h b/PC/pyconfig.h --- a/PC/pyconfig.h +++ b/PC/pyconfig.h @@ -148,7 +148,11 @@ #define COMPILER _Py_PASTE_VERSION("64 bit (Itanium)") #define MS_WINI64 #elif defined(_M_X64) || defined(_M_AMD64) +#ifdef __INTEL_COMPILER +#define COMPILER ("[ICC v." _Py_STRINGIZE(__INTEL_COMPILER) " 64 bit (amd64) with MSC v." _Py_STRINGIZE(_MSC_VER) " CRT]") +#else #define COMPILER _Py_PASTE_VERSION("64 bit (AMD64)") +#endif /* __INTEL_COMPILER */ #define MS_WINX64 #else #define COMPILER _Py_PASTE_VERSION("64 bit (Unknown)") @@ -204,7 +208,11 @@ #if defined(MS_WIN32) && !defined(MS_WIN64) #ifdef _M_IX86 +#ifdef __INTEL_COMPILER +#define COMPILER ("[ICC v." _Py_STRINGIZE(__INTEL_COMPILER) " 32 bit (Intel) with MSC v." _Py_STRINGIZE(_MSC_VER) " CRT]") +#else #define COMPILER _Py_PASTE_VERSION("32 bit (Intel)") +#endif /* __INTEL_COMPILER */ #else #define COMPILER _Py_PASTE_VERSION("32 bit (Unknown)") #endif -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Closes #24953: Merge with 3.5
by zach.ware Aug. 28, 2015

Aug. 28, 2015

https://hg.python.org/cpython/rev/1633fe209375 changeset: 97540:1633fe209375 parent: 97537:d0ff55a6b02f parent: 97539:ca88db01bb51 user: Zachary Ware <zachary.ware(a)gmail.com> date: Sat Aug 29 00:13:14 2015 -0500 summary: Closes #24953: Merge with 3.5 files: PC/pyconfig.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/PC/pyconfig.h b/PC/pyconfig.h --- a/PC/pyconfig.h +++ b/PC/pyconfig.h @@ -147,7 +147,11 @@ #define MS_WINI64 #define PYD_PLATFORM_TAG "win_ia64" #elif defined(_M_X64) || defined(_M_AMD64) +#if defined(__INTEL_COMPILER) +#define COMPILER ("[ICC v." _Py_STRINGIZE(__INTEL_COMPILER) " 64 bit (amd64) with MSC v." _Py_STRINGIZE(_MSC_VER) " CRT]") +#else #define COMPILER _Py_PASTE_VERSION("64 bit (AMD64)") +#endif /* __INTEL_COMPILER */ #define MS_WINX64 #define PYD_PLATFORM_TAG "win_amd64" #else @@ -194,7 +198,11 @@ #if defined(MS_WIN32) && !defined(MS_WIN64) #if defined(_M_IX86) +#if defined(__INTEL_COMPILER) +#define COMPILER ("[ICC v." _Py_STRINGIZE(__INTEL_COMPILER) " 32 bit (Intel) with MSC v." _Py_STRINGIZE(_MSC_VER) " CRT]") +#else #define COMPILER _Py_PASTE_VERSION("32 bit (Intel)") +#endif /* __INTEL_COMPILER */ #define PYD_PLATFORM_TAG "win32" #elif defined(_M_ARM) #define COMPILER _Py_PASTE_VERSION("32 bit (ARM)") -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Issue #24953: Include ICC version in sys.version string when bulit with ICC on
by zach.ware Aug. 28, 2015

Aug. 28, 2015

https://hg.python.org/cpython/rev/ca88db01bb51 changeset: 97539:ca88db01bb51 branch: 3.5 parent: 97535:687da8760a58 user: Zachary Ware <zachary.ware(a)gmail.com> date: Fri Aug 28 23:52:31 2015 -0500 summary: Issue #24953: Include ICC version in sys.version string when bulit with ICC on Windows files: PC/pyconfig.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/PC/pyconfig.h b/PC/pyconfig.h --- a/PC/pyconfig.h +++ b/PC/pyconfig.h @@ -147,7 +147,11 @@ #define MS_WINI64 #define PYD_PLATFORM_TAG "win_ia64" #elif defined(_M_X64) || defined(_M_AMD64) +#if defined(__INTEL_COMPILER) +#define COMPILER ("[ICC v." _Py_STRINGIZE(__INTEL_COMPILER) " 64 bit (amd64) with MSC v." _Py_STRINGIZE(_MSC_VER) " CRT]") +#else #define COMPILER _Py_PASTE_VERSION("64 bit (AMD64)") +#endif /* __INTEL_COMPILER */ #define MS_WINX64 #define PYD_PLATFORM_TAG "win_amd64" #else @@ -194,7 +198,11 @@ #if defined(MS_WIN32) && !defined(MS_WIN64) #if defined(_M_IX86) +#if defined(__INTEL_COMPILER) +#define COMPILER ("[ICC v." _Py_STRINGIZE(__INTEL_COMPILER) " 32 bit (Intel) with MSC v." _Py_STRINGIZE(_MSC_VER) " CRT]") +#else #define COMPILER _Py_PASTE_VERSION("32 bit (Intel)") +#endif /* __INTEL_COMPILER */ #define PYD_PLATFORM_TAG "win32" #elif defined(_M_ARM) #define COMPILER _Py_PASTE_VERSION("32 bit (ARM)") -- Repository URL: https://hg.python.org/cpython

1 0

peps: Added a section on the same expression being used multiple times in the same
by eric.smith Aug. 28, 2015

Aug. 28, 2015

https://hg.python.org/peps/rev/9af8765a7661 changeset: 6006:9af8765a7661 user: Eric V. Smith <eric(a)trueblade.com> date: Fri Aug 28 21:43:48 2015 -0400 summary: Added a section on the same expression being used multiple times in the same f-string. files: pep-0498.txt | 41 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 38 insertions(+), 3 deletions(-) diff --git a/pep-0498.txt b/pep-0498.txt --- a/pep-0498.txt +++ b/pep-0498.txt @@ -640,10 +640,45 @@ f'{x:.{width}}' -Expressions used multiple times -------------------------------- +The same expression used multiple times +--------------------------------------- -xxx +Every expression in braces in an f-string is evaluated exactly +once. If the same expression is used more than once in the same +f-string, it will be evaluated multiple times. However, it's undefined +which result will show up in the resulting string value. For purposes +of this section, two expressions are the same if they have the exact +same literal text defining them. For example, '{i}' and '{i}' are the +same expression, but '{i}' and '{ i}' are not, due to the extra space +in the second expression. + +For example, given:: + + >>> def fn(lst): + ... lst[0] += 1 + ... return lst[0] + ... + >>> lst=[0] + >>> f'{fn(lst)} {fn(lst)}' + '1 2' + +The resulting f-string might have the value '1 2', '2 2', '1 1', or +even '2 1'. + +However:: + + >>> lst=[0] + >>> f'{fn(lst)} { fn(lst)}' + '1 2' + +This f-string will always have the value '1 2'. This is due to the two +expressions not being the same: the space in the second example makes +the two expressions distinct. + +This restriction is in place in order to allow for a possible future +extension allowing translated strings, wherein the expression +substitutions would be identified by their text values as they show up +between the braces. References ========== -- Repository URL: https://hg.python.org/peps

1 0

cpython: Fixed typos in TZ format description
by alexander.belopolsky Aug. 28, 2015

Aug. 28, 2015

https://hg.python.org/cpython/rev/d0ff55a6b02f changeset: 97537:d0ff55a6b02f user: Alexander Belopolsky <alexander.belopolsky(a)gmail.com> date: Fri Aug 28 16:56:45 2015 -0400 summary: Fixed typos in TZ format description files: Doc/library/time.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/library/time.rst b/Doc/library/time.rst --- a/Doc/library/time.rst +++ b/Doc/library/time.rst @@ -634,11 +634,11 @@ it is possible to refer to February 29. :samp:`M{m}.{n}.{d}` - The *d*'th day (0 <= *d* <= 6) or week *n* of month *m* of the year (1 + The *d*'th day (0 <= *d* <= 6) of week *n* of month *m* of the year (1 <= *n* <= 5, 1 <= *m* <= 12, where week 5 means "the last *d* day in month *m*" which may occur in either the fourth or the fifth week). Week 1 is the first week in which the *d*'th day occurs. Day - zero is Sunday. + zero is a Sunday. ``time`` has the same format as ``offset`` except that no leading sign ('-' or '+') is allowed. The default, if time is not given, is 02:00:00. -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Issue #24881: Fixed setting binary mode in Python implementation of FileIO
by serhiy.storchaka Aug. 28, 2015

Aug. 28, 2015

https://hg.python.org/cpython/rev/2dd9294f679d changeset: 97536:2dd9294f679d parent: 97534:bf789ae9bde7 parent: 97535:687da8760a58 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Fri Aug 28 22:20:29 2015 +0300 summary: Issue #24881: Fixed setting binary mode in Python implementation of FileIO on Windows and Cygwin. Patch from Akira Li. files: Lib/_pyio.py | 3 ++- Misc/NEWS | 3 +++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/Lib/_pyio.py b/Lib/_pyio.py --- a/Lib/_pyio.py +++ b/Lib/_pyio.py @@ -8,12 +8,13 @@ import errno import array import stat +import sys # Import _thread instead of threading to reduce startup cost try: from _thread import allocate_lock as Lock except ImportError: from _dummy_thread import allocate_lock as Lock -if os.name == 'win32': +if sys.platform in {'win32', 'cygwin'}: from msvcrt import setmode as _setmode else: _setmode = None diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -79,6 +79,9 @@ Library ------- +- Issue #24881: Fixed setting binary mode in Python implementation of FileIO + on Windows and Cygwin. Patch from Akira Li. + - Issue #21112: Fix regression in unittest.expectedFailure on subclasses. Patch from Berker Peksag. -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Issue #24881: Fixed setting binary mode in Python implementation of FileIO
by serhiy.storchaka Aug. 28, 2015

Aug. 28, 2015

https://hg.python.org/cpython/rev/687da8760a58 changeset: 97535:687da8760a58 branch: 3.5 parent: 97533:ac3f1a6b1de2 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Fri Aug 28 22:17:04 2015 +0300 summary: Issue #24881: Fixed setting binary mode in Python implementation of FileIO on Windows and Cygwin. Patch from Akira Li. files: Lib/_pyio.py | 3 ++- Misc/NEWS | 3 +++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/Lib/_pyio.py b/Lib/_pyio.py --- a/Lib/_pyio.py +++ b/Lib/_pyio.py @@ -8,12 +8,13 @@ import errno import array import stat +import sys # Import _thread instead of threading to reduce startup cost try: from _thread import allocate_lock as Lock except ImportError: from _dummy_thread import allocate_lock as Lock -if os.name == 'win32': +if sys.platform in {'win32', 'cygwin'}: from msvcrt import setmode as _setmode else: _setmode = None diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -14,6 +14,9 @@ Library ------- +- Issue #24881: Fixed setting binary mode in Python implementation of FileIO + on Windows and Cygwin. Patch from Akira Li. + - Issue #21112: Fix regression in unittest.expectedFailure on subclasses. Patch from Berker Peksag. -- Repository URL: https://hg.python.org/cpython

1 0

peps: Fixed escape sequence.
by eric.smith Aug. 28, 2015

Aug. 28, 2015

https://hg.python.org/peps/rev/bf851048278c changeset: 6005:bf851048278c user: Eric V. Smith <eric(a)trueblade.com> date: Fri Aug 28 14:59:05 2015 -0400 summary: Fixed escape sequence. files: pep-0498.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pep-0498.txt b/pep-0498.txt --- a/pep-0498.txt +++ b/pep-0498.txt @@ -213,7 +213,7 @@ Scanning an f-string for expressions happens after escape sequences are decoded. Because hex(ord('{')) == 0x7b, the f-string -f'\u007b4*10}' is decoded to f'{4*10}', which evaluates as the integer +f'\\u007b4*10}' is decoded to f'{4*10}', which evaluates as the integer 40:: >>> f'\u007b4*10}' -- Repository URL: https://hg.python.org/peps

1 0