[Checkins] SVN: zope.server/trunk/ Removed the dependency on ZODB3 (and zope.thread).

[Jim Fulton]

Log message for revision 84016:
  Removed the dependency on ZODB3 (and zope.thread).
  

Changed:
  U   zope.server/trunk/CHANGES.txt
  U   zope.server/trunk/setup.py
  U   zope.server/trunk/src/zope/server/http/wsgihttpserver.py
  U   zope.server/trunk/src/zope/server/trigger.py

-=-
Modified: zope.server/trunk/CHANGES.txt
===================================================================
--- zope.server/trunk/CHANGES.txt	2008-02-18 10:24:10 UTC (rev 84015)
+++ zope.server/trunk/CHANGES.txt	2008-02-18 11:25:48 UTC (rev 84016)
@@ -10,6 +10,8 @@
 - Fix of 599 error on conflict error in request
   see: http://mail.zope.org/pipermail/zope-dev/2008-January/030844.html
 
+- Removed dependency on ZODB.
+
 3.4.1 and 3.5.0a2 (2007-06-02)
 ------------------------------
 

Modified: zope.server/trunk/setup.py
===================================================================
--- zope.server/trunk/setup.py	2008-02-18 10:24:10 UTC (rev 84015)
+++ zope.server/trunk/setup.py	2008-02-18 11:25:48 UTC (rev 84016)
@@ -56,7 +56,8 @@
                         'zope.publisher',
                         'zope.security',
                         'zope.deprecation',
-	                'ZODB3'],
+	                'ZODB3',
+                        ],
     include_package_data = True,
     zip_safe = False,
     entry_points = """

Modified: zope.server/trunk/src/zope/server/http/wsgihttpserver.py
===================================================================
--- zope.server/trunk/src/zope/server/http/wsgihttpserver.py	2008-02-18 10:24:10 UTC (rev 84015)
+++ zope.server/trunk/src/zope/server/http/wsgihttpserver.py	2008-02-18 11:25:48 UTC (rev 84016)
@@ -15,9 +15,9 @@
 
 $Id$
 """
+import asyncore
 import re
 import sys
-import ThreadedAsync
 from zope.server.http.httpserver import HTTPServer
 from zope.server.taskthreads import ThreadedTaskDispatcher
 import zope.security.management
@@ -123,4 +123,4 @@
     task_dispatcher.setThreadCount(threads)
     server = WSGIHTTPServer(wsgi_app, name, host, port,
                             task_dispatcher=task_dispatcher)    
-    ThreadedAsync.loop()
+    asyncore.loop()

Modified: zope.server/trunk/src/zope/server/trigger.py
===================================================================
--- zope.server/trunk/src/zope/server/trigger.py	2008-02-18 10:24:10 UTC (rev 84015)
+++ zope.server/trunk/src/zope/server/trigger.py	2008-02-18 11:25:48 UTC (rev 84016)
@@ -15,11 +15,20 @@
 import asyncore
 import os
 import socket
+import struct
 import thread
 import errno
 
-from ZODB.utils import positive_id
+_ADDRESS_MASK = 256 ** struct.calcsize('P')
+def positive_id(obj):
+    """Return id(obj) as a non-negative integer."""
 
+    result = id(obj)
+    if result < 0:
+        result += _ADDRESS_MASK
+        assert result > 0
+    return result
+
 # Original comments follow; they're hard to follow in the context of
 # ZEO's use of triggers.  TODO:  rewrite from a ZEO perspective.