[Zope-Checkins] SVN: Products.Five/branches/1.0/ Added missing fix from newer versions of Five where the _context wasn't getting cleaned up properly in zcml.py. Without this fix, adapter lookups wouldn't work in any test after the first test that used load_zcml in the same test fixture (essentially adapter lookups were dead).

[Rocky Burt]

Log message for revision 66160:
  Added missing fix from newer versions of Five where the _context wasn't getting cleaned up properly in zcml.py.  Without this fix, adapter lookups wouldn't work in any test after the first test that used load_zcml in the same test fixture (essentially adapter lookups were dead).

Changed:
  U   Products.Five/branches/1.0/CHANGES.txt
  U   Products.Five/branches/1.0/zcml.py

-=-
Modified: Products.Five/branches/1.0/CHANGES.txt
===================================================================
--- Products.Five/branches/1.0/CHANGES.txt	2006-03-25 11:23:51 UTC (rev 66159)
+++ Products.Five/branches/1.0/CHANGES.txt	2006-03-25 12:59:18 UTC (rev 66160)
@@ -5,6 +5,11 @@
 Five 1.0.3 (...)
 ================
 
+* Added missing fix from newer versions of Five where the _context wasn't
+  getting cleaned up properly in zcml.py.  Without this fix, adapter lookups
+  wouldn't work in any test after the first test that used load_zcml in the 
+  same test fixture (essentially adapter lookups were dead).
+
 * Fixed bug that broke WebDAV access for five:defaultViewable objects. The
   __browser_default__ now modifies only GET and POST requests.
 

Modified: Products.Five/branches/1.0/zcml.py
===================================================================
--- Products.Five/branches/1.0/zcml.py	2006-03-25 11:23:51 UTC (rev 66159)
+++ Products.Five/branches/1.0/zcml.py	2006-03-25 12:59:18 UTC (rev 66160)
@@ -61,3 +61,12 @@
     global _context
     _context = xmlconfig.string(s, _context)
 
+# clean up code
+
+def cleanUp():
+    global _context
+    _context = None
+
+from zope.testing.cleanup import addCleanUp
+addCleanUp(cleanUp)
+del addCleanUp