mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-01 07:33:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fixes issue #1522237, bad init check in _threading_local

Browse source
This commit is contained in:
Jack Diederich 2010-02-22 19:55:22 +00:00
parent b72b0eb357
commit 1ce6136018
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/_threading_local.py
View file

@ -155,7 +155,7 @@ class _localbase(object):
object.__setattr__(self, '_local__args', (args, kw)) object.__setattr__(self, '_local__args', (args, kw))
object.__setattr__(self, '_local__lock', RLock()) object.__setattr__(self, '_local__lock', RLock())
if args or kw and (cls.__init__ is object.__init__): if (args or kw) and (cls.__init__ is object.__init__):
raise TypeError("Initialization arguments are not supported") raise TypeError("Initialization arguments are not supported")
# We need to create the thread dict in anticipation of # We need to create the thread dict in anticipation of

15
Lib/test/test_threading_local.py
View file

@ -105,6 +105,21 @@ class ThreadingLocalTest(unittest.TestCase):
self.assertTrue(passed[0]) self.assertTrue(passed[0])
def test_arguments(self):
# Issue 1522237
from thread import _local as local
from _threading_local import local as py_local
for cls in (local, py_local):
class MyLocal(cls):
def __init__(self, *args, **kwargs):
pass
MyLocal(a=1)
MyLocal(1)
self.assertRaises(TypeError, cls, a=1)
self.assertRaises(TypeError, cls, 1)
def test_main(): def test_main():
suite = unittest.TestSuite() suite = unittest.TestSuite()