[CMF-checkins] SVN: CMF/branches/1.5/C Remove deprecation of 'manage_addMCFSite' added after release branch.

[Tres Seaver]

Log message for revision 69957:
  Remove deprecation of 'manage_addMCFSite' added after release branch.

Changed:
  U   CMF/branches/1.5/CHANGES.txt
  U   CMF/branches/1.5/CMFDefault/Portal.py
  U   CMF/branches/1.5/CMFDefault/tests/test_Portal.py

-=-
Modified: CMF/branches/1.5/CHANGES.txt
===================================================================
--- CMF/branches/1.5/CHANGES.txt	2006-09-04 17:32:07 UTC (rev 69956)
+++ CMF/branches/1.5/CHANGES.txt	2006-09-04 17:52:25 UTC (rev 69957)
@@ -1,3 +1,11 @@
+After CMF 1.5.7 
+
+  Others
+
+    - CMFDefault.Portal:  Reverted deprecation of 'manage_addCMFSite', assed
+      in CMF 1.5.5-beta, because it violates the policy / expectation that
+      features are added / deprecated only at "second-dot" releases.
+
 CMF 1.5.7 (08/27/06)
 
   No changes from 1.5.7-beta

Modified: CMF/branches/1.5/CMFDefault/Portal.py
===================================================================
--- CMF/branches/1.5/CMFDefault/Portal.py	2006-09-04 17:32:07 UTC (rev 69956)
+++ CMF/branches/1.5/CMFDefault/Portal.py	2006-09-04 17:52:25 UTC (rev 69957)
@@ -299,14 +299,6 @@
                          RESPONSE=None):
     """ Adds a portal instance.
     """
-    from warnings import warn
-
-    warn("manage_addCMFSite is a deprecated way to create a CMF site;  in the "
-         "future, please use CMFSetup's 'Configured CMF Site' (from the ZMI "
-         "add menu) or 'CMFSetup.factory.addConfiguredSite' (from Python).  "
-         "manage_addCMFSite will be removed in CMF 2.0.",
-         DeprecationWarning, 2)
-
     gen = PortalGenerator()
     id = id.strip()
     p = gen.create(self, id, create_userfolder)

Modified: CMF/branches/1.5/CMFDefault/tests/test_Portal.py
===================================================================
--- CMF/branches/1.5/CMFDefault/tests/test_Portal.py	2006-09-04 17:32:07 UTC (rev 69956)
+++ CMF/branches/1.5/CMFDefault/tests/test_Portal.py	2006-09-04 17:52:25 UTC (rev 69957)
@@ -198,22 +198,6 @@
         doc.edit( '<h1>Extra!</h1>' )
         self.assertEqual( _getMetadata( catalog, rid ), 'Bar' )
 
-    def test_manage_addCMFSite_emits_DeprecationWarning( self ):
-
-        # This warning is recorded in *our* globals (stacklevel=2).
-        registry = globals().get("__warningregistry__")
-
-        if registry is not None:
-            registry.clear()
-
-        # Check that a warning was raised.
-        site = self._makeSite( 'emits_warning' )
-
-        self.assertEqual( len( registry ), 1 )
-        message, category, linenoe  = registry.keys()[ 0 ]
-        self.failUnless( 'manage_addCMFSite' in message, message )
-        self.failUnless( category is DeprecationWarning, category )
-
 def _getMetadata( catalog, rid, field='Title' ):
     md = catalog.getMetadataForRID( rid )
     return md[ field ]