[Zope-Checkins] SVN: Zope/trunk/ Collector #1621, 1894: Removed support for use of long-deprecated 'whrandom' module.

[Tres Seaver]

Log message for revision 40320:
  Collector #1621, 1894:  Removed support for use of long-deprecated 'whrandom' module.
  
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/lib/python/AccessControl/DTML.py
  U   Zope/trunk/lib/python/DocumentTemplate/DT_Util.py
  U   Zope/trunk/lib/python/Products/PythonScripts/help/PythonScript.py
  U   Zope/trunk/lib/python/RestrictedPython/Utilities.py

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===================================================================
--- Zope/trunk/doc/CHANGES.txt	2005-11-22 15:49:55 UTC (rev 40319)
+++ Zope/trunk/doc/CHANGES.txt	2005-11-22 16:08:56 UTC (rev 40320)
@@ -100,6 +100,9 @@
 
     Bugs Fixed
 
+      - Collector #1621, 1894:  Removed support for use of long-deprecated
+        'whrandom' module.
+
       - OFS PropertySheets / webdav: Fixed dav__resourcetype.
         __dav_collection__ with a false value was overridden by
         isAnObjectManager.

Modified: Zope/trunk/lib/python/AccessControl/DTML.py
===================================================================
--- Zope/trunk/lib/python/AccessControl/DTML.py	2005-11-22 15:49:55 UTC (rev 40319)
+++ Zope/trunk/lib/python/AccessControl/DTML.py	2005-11-22 16:08:56 UTC (rev 40320)
@@ -15,7 +15,7 @@
 $Id$
 """
 from DocumentTemplate import DT_Util
-import SecurityManagement, string, math, whrandom, random
+import SecurityManagement, string, math, random
 import DocumentTemplate.sequence
 
 from ZopeGuards import safe_builtins
@@ -27,7 +27,6 @@
 DT_Util.TemplateDict.__allow_access_to_unprotected_subobjects__=1
 string.__allow_access_to_unprotected_subobjects__=1
 math.__allow_access_to_unprotected_subobjects__=1
-whrandom.__allow_access_to_unprotected_subobjects__=1
 random.__allow_access_to_unprotected_subobjects__=1
 
 DocumentTemplate.sequence.__allow_access_to_unprotected_subobjects__=1

Modified: Zope/trunk/lib/python/DocumentTemplate/DT_Util.py
===================================================================
--- Zope/trunk/lib/python/DocumentTemplate/DT_Util.py	2005-11-22 15:49:55 UTC (rev 40319)
+++ Zope/trunk/lib/python/DocumentTemplate/DT_Util.py	2005-11-22 16:08:56 UTC (rev 40320)
@@ -315,7 +315,7 @@
 
   - Special security-aware versions of 'getattr' and 'hasattr',
 
-  - The Python 'string', 'math', and 'whrandom' modules, and
+  - The Python 'string', 'math', and 'random' modules, and
 
   - A special function, 'test', that supports if-then expressions.
     The 'test' function accepts any number of arguments.  If the

Modified: Zope/trunk/lib/python/Products/PythonScripts/help/PythonScript.py
===================================================================
--- Zope/trunk/lib/python/Products/PythonScripts/help/PythonScript.py	2005-11-22 15:49:55 UTC (rev 40319)
+++ Zope/trunk/lib/python/Products/PythonScripts/help/PythonScript.py	2005-11-22 16:08:56 UTC (rev 40320)
@@ -54,7 +54,7 @@
 
           o math
 
-          o whrandom and random
+          o random
 
           o Products.PythonScripts.standard
 

Modified: Zope/trunk/lib/python/RestrictedPython/Utilities.py
===================================================================
--- Zope/trunk/lib/python/RestrictedPython/Utilities.py	2005-11-22 15:49:55 UTC (rev 40319)
+++ Zope/trunk/lib/python/RestrictedPython/Utilities.py	2005-11-22 16:08:56 UTC (rev 40320)
@@ -13,7 +13,7 @@
 
 __version__='$Revision: 1.7 $'[11:-2]
 
-import string, math, random, whrandom
+import string, math, random
 import DocumentTemplate.sequence
 from DateTime.DateTime import DateTime
 
@@ -22,7 +22,6 @@
 utility_builtins['string'] = string
 utility_builtins['math'] = math
 utility_builtins['random'] = random
-utility_builtins['whrandom'] = whrandom
 utility_builtins['sequence'] = DocumentTemplate.sequence
 utility_builtins['DateTime'] = DateTime