[Zope-Checkins] SVN: Zope/trunk/ - ZCatalog: removed manage_deleteIndex(), manage_delColumns()

[Andreas Jung]

Log message for revision 67631:
        - ZCatalog: removed manage_deleteIndex(), manage_delColumns()
          which were deprecated since Zope 2.4
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/lib/python/Products/ZCatalog/ZCatalog.py

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===================================================================
--- Zope/trunk/doc/CHANGES.txt	2006-04-27 00:54:03 UTC (rev 67630)
+++ Zope/trunk/doc/CHANGES.txt	2006-04-27 07:55:45 UTC (rev 67631)
@@ -18,6 +18,9 @@
 
     Restructuring
 
+      - ZCatalog: removed manage_deleteIndex(), manage_delColumns()
+        which were deprecated since Zope 2.4
+
       - deprecated the zLOG module. Use Pythons 'logging' module instead.
 
       - replaced all zLOG occurences (expect the zLOG module itself) with 

Modified: Zope/trunk/lib/python/Products/ZCatalog/ZCatalog.py
===================================================================
--- Zope/trunk/lib/python/Products/ZCatalog/ZCatalog.py	2006-04-27 00:54:03 UTC (rev 67630)
+++ Zope/trunk/lib/python/Products/ZCatalog/ZCatalog.py	2006-04-27 07:55:45 UTC (rev 67631)
@@ -372,25 +372,6 @@
                 '/manage_catalogSchema?manage_tabs_message=Column%20Added')
 
 
-    security.declareProtected(manage_zcatalog_entries, 'manage_delColumns')
-    def manage_delColumns(self, names, REQUEST=None, RESPONSE=None, URL1=None):
-        """ Deprecated method. Use manage_delColumn instead. """
-        # log a deprecation warning
-        import warnings
-        warnings.warn(
-            "The manage_delColumns method of ZCatalog is deprecated"
-            "since Zope 2.4.2.\n"
-            "This method is only kept for backwards compatibility "
-            "for a while\n"
-            "and will go away in a future release.\n"
-            "\n"
-            "Please use instead the manage_delColumn method.\n"
-            ,DeprecationWarning)
-
-        self.manage_delColumn(names, REQUEST=REQUEST, RESPONSE=RESPONSE,
-                              URL1=URL1)
-
-
     security.declareProtected(manage_zcatalog_entries, 'manage_delColumn')
     def manage_delColumn(self, names, REQUEST=None, RESPONSE=None, URL1=None):
         """ delete a column or some columns """
@@ -418,26 +399,6 @@
                 '/manage_catalogIndexes?manage_tabs_message=Index%20Added')
 
 
-    security.declareProtected(manage_zcatalog_entries, 'manage_deleteIndex')
-    def manage_deleteIndex(self, ids=None, REQUEST=None, RESPONSE=None,
-        URL1=None):
-        """ Deprecated method. Use manage_delIndex instead. """
-        # log a deprecation warning
-        import warnings
-        warnings.warn(
-            "The manage_deleteIndex method of ZCatalog is deprecated"
-            "since Zope 2.4.2.\n"
-            "This method is only kept for backwards compatibility for a "
-            "while\n"
-            "and will go away in a future release.\n"
-            "\n"
-            "Please use instead the manage_delIndex method.\n"
-            ,DeprecationWarning)
-
-        self.manage_delIndex(ids=ids, REQUEST=REQUEST, RESPONSE=RESPONSE,
-                             URL1=URL1)
-
-
     security.declareProtected(manage_zcatalog_entries, 'manage_delIndex')
     def manage_delIndex(self, ids=None, REQUEST=None, RESPONSE=None,
         URL1=None):