[pypy-commit] pypy release-pypy2.7-5.x: merge default

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: release-pypy2.7-5.x
Changeset: r90757:fa3249d55d15
Date: 2017-03-19 12:55 -0700
http://bitbucket.org/pypy/pypy/changeset/fa3249d55d15/

Log:	merge default

diff --git a/pypy/module/thread/os_local.py b/pypy/module/thread/os_local.py
--- a/pypy/module/thread/os_local.py
+++ b/pypy/module/thread/os_local.py
@@ -75,6 +75,8 @@
         return w_dict
 
     def descr_local__new__(space, w_subtype, __args__):
+        from pypy.objspace.std.typeobject import _precheck_for_new
+        w_subtype = _precheck_for_new(space, w_subtype)
         if __args__.arguments_w or __args__.keywords:
             w_parent_init, _ = space.lookup_in_type_where(w_subtype, '__init__')
             if w_parent_init is space.w_object: