Merge

pep-0263.txt

@@ -61,11 +61,13 @@ Defining the Encoding
           # vim: set fileencoding=<encoding name> :
 
     More precisely, the first or second line must match the regular
-    expression "coding[:=]\s*([-\w.]+)". The first group of this
+    expression "^[ \t\v]*#.*?coding[:=][ \t]*([-_.a-zA-Z0-9]+)".
+    The first group of this
     expression is then interpreted as encoding name. If the encoding
     is unknown to Python, an error is raised during compilation. There
     must not be any Python statement on the line that contains the
-    encoding declaration.
+    encoding declaration.  If the first line matches the second line
+    is ignored.
 
     To aid with platforms such as Windows, which add Unicode BOM marks
     to the beginning of Unicode files, the UTF-8 signature

pep-0483.txt

@@ -224,10 +224,6 @@ are still controversial or not fully specified.)
 
   *  x = []  # type: Sequence[int]
 
-- Type declarations using Undefined, e.g.
-
-  *  x = Undefined(str)
-
 - Casts using cast(T, x), e.g.
 
   * x = cast(Any, frobozz())

pep-0514.txt

@@ -7,7 +7,7 @@ Status: Draft
 Type: Informational
 Content-Type: text/x-rst
 Created: 02-Feb-2016
-Post-History: 02-Feb-2016
+Post-History: 02-Feb-2016, 01-Mar-2016
 
 Abstract
 ========
@@ -82,9 +82,9 @@ Tools that include every installed environment, even where the Company-Tag pairs
 match, should ensure users can easily identify whether the registration was
 per-user or per-machine.
 
-Tools that give priority to user preferences must ignore values from
-``HKEY_LOCAL_MACHINE`` when a matching Company-Tag pair exists is in
-``HKEY_CURRENT_USER``.
+When tools are selecting a single installed environment from all registered
+environments, the intent is that user preferences from ``HKEY_CURRENT_USER``
+will override matching Company-Tag pairs in ``HKEY_LOCAL_MACHINE``.
 
 Official Python releases use ``PythonCore`` for Company, and the value of
 ``sys.winver`` for Tag. Other registered environments may use any values for
@@ -118,8 +118,8 @@ current user. Python 3.5 and later always uses different Tags for 64-bit and
 32-bit versions.
 
 Environments registered under other Company names must use distinct Tags to
-support side-by-side installations. There is no backwards compatibility
-allowance.
+support side-by-side installations. Tools consuming these registrations are
+not required to disambiguate tags other than by preferring the user's setting.
 
 Company
 -------
@@ -242,7 +242,10 @@ Other Keys
 Some other registry keys are used for defining or inferring search paths under
 certain conditions. A third-party installation is permitted to define these keys
 under their Company-Tag key, however, the interpreter must be modified and
-rebuilt in order to read these values.
+rebuilt in order to read these values. Alternatively, the interpreter may be
+modified to not use any registry keys for determining search paths. Making such
+changes is a decision for the third party; this PEP makes no recommendation 
+either way.
 
 Copyright
 =========