Author: Brian Kearns <bdkea...@gmail.com> Branch: py3k Changeset: r62215:1854c25557ed Date: 2013-03-08 01:45 -0500 http://bitbucket.org/pypy/pypy/changeset/1854c25557ed/
Log: merge default diff --git a/lib_pypy/greenlet.py b/lib_pypy/greenlet.py --- a/lib_pypy/greenlet.py +++ b/lib_pypy/greenlet.py @@ -111,7 +111,7 @@ # Internal stuff try: - from _thread import _local + from threading import local as _local except ImportError: class _local(object): # assume no threads pass diff --git a/lib_pypy/stackless.py b/lib_pypy/stackless.py --- a/lib_pypy/stackless.py +++ b/lib_pypy/stackless.py @@ -93,7 +93,7 @@ try: - from _thread import _local + from threading import local as _local except ImportError: class _local(object): # assume no threads pass _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit