[Zope-Checkins] SVN: Zope/trunk/ Drop the dependency on the ThreadLock distribution, by using Python's thread module instead.

[Hanno Schlichting]

Log message for revision 112372:
  Drop the dependency on the ThreadLock distribution, by using Python's thread module instead.
  

Changed:
  U   Zope/trunk/buildout.cfg
  U   Zope/trunk/doc/CHANGES.rst
  U   Zope/trunk/setup.py
  U   Zope/trunk/src/Shared/DC/ZRDB/THUNK.py
  U   Zope/trunk/versions.cfg

-=-
Modified: Zope/trunk/buildout.cfg
===================================================================
--- Zope/trunk/buildout.cfg	2010-05-16 17:54:14 UTC (rev 112371)
+++ Zope/trunk/buildout.cfg	2010-05-16 18:24:16 UTC (rev 112372)
@@ -41,7 +41,6 @@
     Persistence
     Record
     RestrictedPython
-    ThreadLock
     initgroups
     tempstorage
     ZopeUndo

Modified: Zope/trunk/doc/CHANGES.rst
===================================================================
--- Zope/trunk/doc/CHANGES.rst	2010-05-16 17:54:14 UTC (rev 112371)
+++ Zope/trunk/doc/CHANGES.rst	2010-05-16 18:24:16 UTC (rev 112372)
@@ -11,6 +11,9 @@
 Restructuring
 +++++++++++++
 
+- Drop the dependency on the ThreadLock distribution, by using Python's thread
+  module instead.
+
 - Removed Zope2's own mkzeoinstance script. If you want to set up ZEO instances
   please install the zope.mkzeoinstance and use its script.
 

Modified: Zope/trunk/setup.py
===================================================================
--- Zope/trunk/setup.py	2010-05-16 17:54:14 UTC (rev 112371)
+++ Zope/trunk/setup.py	2010-05-16 18:24:16 UTC (rev 112372)
@@ -66,7 +66,6 @@
       'Persistence',
       'Record',
       'RestrictedPython',
-      'ThreadLock',
       'ZConfig',
       'ZODB3',
       'ZopeUndo',

Modified: Zope/trunk/src/Shared/DC/ZRDB/THUNK.py
===================================================================
--- Zope/trunk/src/Shared/DC/ZRDB/THUNK.py	2010-05-16 17:54:14 UTC (rev 112371)
+++ Zope/trunk/src/Shared/DC/ZRDB/THUNK.py	2010-05-16 18:24:16 UTC (rev 112372)
@@ -11,11 +11,13 @@
 #
 ##############################################################################
 
-import TM, ThreadLock
+import thread
+
+import TM
 from TM import Surrogate
 import transaction
 
-thunk_lock=ThreadLock.allocate_lock()
+thunk_lock = thread.allocate_lock()
 
 class THUNKED_TM(TM.TM):
     """A big heavy hammer for handling non-thread safe DAs
@@ -35,14 +37,16 @@
 
     def tpc_finish(self, *ignored):
         if self._registered:
-            try: self._finish()
+            try:
+                self._finish()
             finally:
                 thunk_lock.release()
                 self._registered=0
 
     def abort(self, *ignored):
         if self._registered:
-            try: self._abort()
+            try:
+                self._abort()
             finally:
                 thunk_lock.release()
                 self._registered=0

Modified: Zope/trunk/versions.cfg
===================================================================
--- Zope/trunk/versions.cfg	2010-05-16 17:54:14 UTC (rev 112371)
+++ Zope/trunk/versions.cfg	2010-05-16 18:24:16 UTC (rev 112372)
@@ -14,7 +14,6 @@
 Record = 2.13.0
 RestrictedPython = 3.5.2
 tempstorage = 2.11.2
-ThreadLock = 2.13.0
 ZopeUndo = 2.12.0
 
 # Zope2 dependencies