[Zodb-checkins] CVS: StandaloneZODB/ThreadedAsync - LoopCallback.py:1.2.8.1 __init__.py:1.2.8.1

[Jeremy Hylton]

Update of /cvs-repository/StandaloneZODB/ThreadedAsync
In directory cvs.zope.org:/tmp/cvs-serv28929/ThreadedAsync

Modified Files:
      Tag: Standby-branch
	LoopCallback.py __init__.py 
Log Message:
Merge StandaloneZODB-1_0-branch into Standby-branch


=== StandaloneZODB/ThreadedAsync/LoopCallback.py 1.2 => 1.2.8.1 ===
+# Copyright (c) 2001 Zope Corporation and Contributors.  All Rights Reserved.
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-# 
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
-# 
-##############################################################################
+# Version 1.1 (ZPL).  A copy of the ZPL should accompany this
+# distribution.  THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL
+# EXPRESS OR IMPLIED WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST
+# INFRINGEMENT, AND FITNESS FOR A PARTICULAR PURPOSE.
+
 """Manage the asyncore mainloop in a multi-threaded app
 
 In a multi-threaded application, only a single thread runs the
@@ -28,7 +25,11 @@
 module is imported, any client of the asyncore module will get
 ThreadedAsync.loop() when it calls asyncore.loop().
 """
+<<<<<<< LoopCallback.py
+__version__='$Revision$'[11:-2]
+=======
 __version__='$Revision$'[11:-2]
+>>>>>>> 1.1.48.1
 
 import asyncore
 import select


=== StandaloneZODB/ThreadedAsync/__init__.py 1.2 => 1.2.8.1 ===
+# Copyright (c) 2001 Zope Corporation and Contributors.  All Rights Reserved.
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-# 
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
-# 
-##############################################################################
+# Version 1.1 (ZPL).  A copy of the ZPL should accompany this
+# distribution.  THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL
+# EXPRESS OR IMPLIED WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST
+# INFRINGEMENT, AND FITNESS FOR A PARTICULAR PURPOSE.
+
 """
 """
 __version__='$Revision$'[11:-2]