[CMF-checkins] SVN: CMF/trunk/C - removed long deprecated by_metatype argument

[Yvo Schubbe]

Log message for revision 37858:
  - removed long deprecated by_metatype argument

Changed:
  U   CMF/trunk/CHANGES.txt
  U   CMF/trunk/CMFCore/TypesTool.py
  U   CMF/trunk/CMFCore/interfaces/portal_types.py

-=-
Modified: CMF/trunk/CHANGES.txt
===================================================================
--- CMF/trunk/CHANGES.txt	2005-08-11 08:41:10 UTC (rev 37857)
+++ CMF/trunk/CHANGES.txt	2005-08-11 08:59:25 UTC (rev 37858)
@@ -69,6 +69,8 @@
 
   Others
 
+    - TypesTool: Removed deprecated by_metatype argument of listContentTypes.
+
     - Some simplifications to the slurp_release release helper script and
       updates to the RELEASE.txt release instructions.
 

Modified: CMF/trunk/CMFCore/TypesTool.py
===================================================================
--- CMF/trunk/CMFCore/TypesTool.py	2005-08-11 08:41:10 UTC (rev 37857)
+++ CMF/trunk/CMFCore/TypesTool.py	2005-08-11 08:59:25 UTC (rev 37858)
@@ -829,24 +829,12 @@
         return rval
 
     security.declareProtected(AccessContentsInformation, 'listContentTypes')
-    def listContentTypes( self, container=None, by_metatype=0 ):
+    def listContentTypes(self, container=None):
+        """ List type info IDs.
         """
-            Return list of content types.
-
-        o Passing 'by_metatype' is deprecated (type information may not
-          correspond 1:1 to an underlying meta_type).
-        """
         typenames = {}
         for t in self.listTypeInfo( container ):
-
-            if by_metatype:
-                warn('TypeInformation.listContentTypes(by_metatype=1) is '
-                     'deprecated.',
-                     DeprecationWarning)
-                name = t.Metatype()
-            else:
-                name = t.getId()
-
+            name = t.getId()
             if name:
                 typenames[ name ] = None
 

Modified: CMF/trunk/CMFCore/interfaces/portal_types.py
===================================================================
--- CMF/trunk/CMFCore/interfaces/portal_types.py	2005-08-11 08:41:10 UTC (rev 37857)
+++ CMF/trunk/CMFCore/interfaces/portal_types.py	2005-08-11 08:59:25 UTC (rev 37858)
@@ -128,13 +128,12 @@
             the user's permissions.
         """
 
-    def listContentTypes(container=None, by_metatype=0):
+    def listContentTypes(container=None):
+        """ List type info IDs.
+
+        If 'container' is passed, then filter the list to include only types
+        which are addable in 'container'.
         """
-            Return list of content types, or the equivalent
-            metatypes;  if 'container' is passed, then filter
-            the list to include only types which are addable in
-            'container'.
-        """
 
     def constructContent(contentType, container, id, RESPONSE=None
                         , *args, **kw):