[z3-checkins] r18138 - z3/Five/branch/Five-1.1

[regebro at codespeak.net]

Author: regebro
Date: Tue Oct  4 17:11:27 2005
New Revision: 18138

Modified:
   z3/Five/branch/Five-1.1/CHANGES.txt
   z3/Five/branch/Five-1.1/monkey.py
Log:
Quick fix for the transaction conflict Tarek found. We are still not 
sure if this fix or Tareks is the best one, but decided to go with with 
this one as it is smaller. If it turns out not to be any good, we'll use 
Tareks branch instead.



Modified: z3/Five/branch/Five-1.1/CHANGES.txt
==============================================================================
--- z3/Five/branch/Five-1.1/CHANGES.txt	(original)
+++ z3/Five/branch/Five-1.1/CHANGES.txt	Tue Oct  4 17:11:27 2005
@@ -51,6 +51,10 @@
 * In some hard to replicate cases, using the "modules" variable in ZPT cause
   an AuthenticationError. Using the secure module importer fixes this.
 
+* There was some cases with conflicts of the transaction module. One
+  fix is included, an alternative is in branch/tziade_transaction.
+  More testing is needed before we know which is the best one. /regebro
+
 Five 1.1b (2005-07-13)
 ======================
 

Modified: z3/Five/branch/Five-1.1/monkey.py
==============================================================================
--- z3/Five/branch/Five-1.1/monkey.py	(original)
+++ z3/Five/branch/Five-1.1/monkey.py	Tue Oct  4 17:11:27 2005
@@ -50,7 +50,7 @@
     i18n.monkey()
 
     try:
-        import Zope2
+        import transaction
     except ImportError:
         import sys
         from Products.Five.bbb import transaction