[pypy-commit] pypy concurrent-marksweep: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: concurrent-marksweep
Changeset: r51658:edaf872702ab
Date: 2012-01-22 20:26 +0100
http://bitbucket.org/pypy/pypy/changeset/edaf872702ab/

Log:	merge heads

diff --git a/pypy/module/thread/ll_thread.py b/pypy/module/thread/ll_thread.py
--- a/pypy/module/thread/ll_thread.py
+++ b/pypy/module/thread/ll_thread.py
@@ -122,9 +122,9 @@
 
     def release(self):
         # Sanity check: the lock must be locked
-        error = self.acquire(False)
+        err = self.acquire(False)
         c_thread_releaselock(self._lock)
-        if error:
+        if err:
             raise error("bad lock")
 
     def __del__(self):