[Checkins] SVN: zope.app.security/trunk/ - Changed globalmodules.zcml to avoid making declarations for

[Jim Fulton]

Log message for revision 102828:
  - Changed globalmodules.zcml to avoid making declarations for
    deprecated standard modules, to avoid deprecation warnings.
  
  Note that globalmodules.zcml should be avoided.  It's better to make
    declarations for only what you actually need to use.
  

Changed:
  U   zope.app.security/trunk/CHANGES.txt
  U   zope.app.security/trunk/src/zope/app/security/globalmodules.zcml

-=-
Modified: zope.app.security/trunk/CHANGES.txt
===================================================================
--- zope.app.security/trunk/CHANGES.txt	2009-08-15 16:51:21 UTC (rev 102827)
+++ zope.app.security/trunk/CHANGES.txt	2009-08-15 19:56:38 UTC (rev 102828)
@@ -2,11 +2,15 @@
 CHANGES
 =======
 
-3.7.1 (unreleased)
+3.7.1 (2009-08-15)
 ------------------
 
-- ...
+- Changed globalmodules.zcml to avoid making declarations for
+  deprecated standard modules, to avoid deprecation warnings.
 
+  Note that globalmodules.zcml should be avoided.  It's better to make
+  declarations for only what you actually need to use.
+
 3.7.0 (2009-03-14)
 ------------------
 

Modified: zope.app.security/trunk/src/zope/app/security/globalmodules.zcml
===================================================================
--- zope.app.security/trunk/src/zope/app/security/globalmodules.zcml	2009-08-15 16:51:21 UTC (rev 102827)
+++ zope.app.security/trunk/src/zope/app/security/globalmodules.zcml	2009-08-15 19:56:38 UTC (rev 102828)
@@ -114,10 +114,6 @@
     <allow attributes="array ArrayType" />
   </module>
 
-  <module module="sets">
-    <allow attributes="Set ImmutableSet" />
-  </module>
-
   <module module="itertools">
     <allow attributes="chain count cycle dropwhile iffilter iffilterfalse imap
                        islice izip repeat starmap takewhile" />
@@ -290,18 +286,10 @@
                        Maildir BabylMailbox" />
   </module>
 
-  <module module="mhlib">
-    <allow attributes="MH Folder Message" />
-  </module>
-
   <module module="mimetypes">
     <allow attributes="guess_type guess_all_extensions guess_extension" />
   </module>
 
-  <module module="multifile">
-    <allow attributes="MultiFile" />
-  </module>
-
   <module module="rfc822">
     <allow attributes="Message AddressList quote unquote parseaddr
                        dump_address_pair parsedate parsedate_tz mktime_tz" />
@@ -431,4 +419,19 @@
     <allow attributes="new blocksize digest_size" />
   </module>
 
+  <!-- The following packages have been deprecated in Python 2.6 also.
+       We'll use the same trick. -->
+
+  <configure zcml:condition="not-installed json">
+    <module module="sets">
+      <allow attributes="Set ImmutableSet" />
+    </module>
+    <module module="mhlib">
+      <allow attributes="MH Folder Message" />
+    </module>
+    <module module="multifile">
+      <allow attributes="MultiFile" />
+    </module>>
+  </configure>
+
 </configure>