[Checkins] SVN: Products.CMFCore/trunk/ - reverted revision 94814: this is now fixed in Zope

[Yvo Schubbe]

Log message for revision 102310:
  - reverted revision 94814: this is now fixed in Zope

Changed:
  U   Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt
  U   Products.CMFCore/trunk/Products/CMFCore/FSPythonScript.py
  U   Products.CMFCore/trunk/setup.py

-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt	2009-07-26 13:09:34 UTC (rev 102309)
+++ Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt	2009-07-26 13:33:28 UTC (rev 102310)
@@ -65,9 +65,6 @@
 - No longer catch a `NotImplemented` string exception in the MembershipTool
   in deleteMembers.
 
-- Added `__name__` to the FSPythonScript execution scope in addition to
-  `__file__`. This makes Python 2.6's warnings module happy.
-
 - Cleaned up / normalized imports:
 
   o Don't import from Globals;  instead, use real locations.

Modified: Products.CMFCore/trunk/Products/CMFCore/FSPythonScript.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/FSPythonScript.py	2009-07-26 13:09:34 UTC (rev 102309)
+++ Products.CMFCore/trunk/Products/CMFCore/FSPythonScript.py	2009-07-26 13:33:28 UTC (rev 102310)
@@ -180,7 +180,6 @@
         new_globals['__traceback_supplement__'] = (
             FSPythonScriptTracebackSupplement, self)
         new_globals['__file__'] = self._filepath
-        new_globals['__name__'] = self.id
         if bound_names:
             new_globals.update(bound_names)
         if f.func_defaults:

Modified: Products.CMFCore/trunk/setup.py
===================================================================
--- Products.CMFCore/trunk/setup.py	2009-07-26 13:09:34 UTC (rev 102309)
+++ Products.CMFCore/trunk/setup.py	2009-07-26 13:33:28 UTC (rev 102310)
@@ -46,7 +46,7 @@
                      ],
       install_requires=[
           'setuptools',
-          'Zope2 >= 2.12.0b3dev',
+          'Zope2 >= 2.12.0b4dev',
           'five.localsitemanager >= 0.3',
           'Products.GenericSetup',
           ],