Merge branch 'master' of https://github.com/python/cpython into argparse-reduce-import

serhiy-storchaka · serhiy-storchaka · commit c4495385e2b2 · 2017-09-24T10:55:10.000+03:00
diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst
@@ -111,8 +111,7 @@ More precisely, the expression ``some_value is Derived(some_value)`` is always
 true at runtime.
 
 This also means that it is not possible to create a subtype of ``Derived``
-since it is an identity function at runtime, not an actual type. Similarly, it
-is not possible to create another :func:`NewType` based on a ``Derived`` type::
+since it is an identity function at runtime, not an actual type::
 
    from typing import NewType
 
@@ -121,9 +120,16 @@ is not possible to create another :func:`NewType` based on a ``Derived`` type::
    # Fails at runtime and does not typecheck
    class AdminUserId(UserId): pass
 
-   # Also does not typecheck
+However, it is possible to create a :func:`NewType` based on a 'derived' ``NewType``::
+
+   from typing import NewType
+
+   UserId = NewType('UserId', int)
+
    ProUserId = NewType('ProUserId', UserId)
 
+and typechecking for ``ProUserId`` will work as expected.
+
 See :pep:`484` for more details.
 
 .. note::
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
@@ -941,6 +941,7 @@ _io_TextIOWrapper___init___impl(textio *self, PyObject *buffer,
     else {
         PyErr_SetString(PyExc_OSError,
                         "could not determine default encoding");
+        goto error;
     }
 
     /* Check we have been asked for a real text encoding */

Original file line number	Diff line number	Diff line change
`@@ -941,6 +941,7 @@ _io_TextIOWrapper___init___impl(textio self, PyObject buffer,`
`941`	`941`	`else {`
`942`	`942`	`PyErr_SetString(PyExc_OSError,`
`943`	`943`	`"could not determine default encoding");`
	`944`	`+ goto error;`
`944`	`945`	`}`
`945`	`946`
`946`	`947`	`/* Check we have been asked for a real text encoding */`