[CMF-checkins] SVN: CMF/branches/1.6/CMFCore/ContentTypeRegistry.py * rename conflicting z2 interface imports and import z3 interfaces to work

[Rob Miller]

Log message for revision 40260:
  * rename conflicting z2 interface imports and import z3 interfaces to work
    w/ GenericSetup adaptation
  
  

Changed:
  U   CMF/branches/1.6/CMFCore/ContentTypeRegistry.py

-=-
Modified: CMF/branches/1.6/CMFCore/ContentTypeRegistry.py
===================================================================
--- CMF/branches/1.6/CMFCore/ContentTypeRegistry.py	2005-11-19 20:37:56 UTC (rev 40259)
+++ CMF/branches/1.6/CMFCore/ContentTypeRegistry.py	2005-11-19 20:57:29 UTC (rev 40260)
@@ -25,13 +25,16 @@
 from ZPublisher.mapply import mapply
 
 from interfaces.ContentTypeRegistry \
-        import ContentTypeRegistry as IContentTypeRegistry
+        import ContentTypeRegistry as z2IContentTypeRegistry
 from interfaces.ContentTypeRegistry \
-        import ContentTypeRegistryPredicate as IContentTypeRegistryPredicate
+        import ContentTypeRegistryPredicate as z2IContentTypeRegistryPredicate
 from permissions import ManagePortal
 from utils import _dtmldir
 from utils import getToolByName
 
+from zope.interface import implements
+from interfaces import IContentTypeRegistry
+from interfaces import IContentTypeRegistryPredicate
 
 class MajorMinorPredicate( SimpleItem ):
     """
@@ -39,7 +42,8 @@
         Empty major or minor implies wildcard (all match).
     """
 
-    __implements__ = IContentTypeRegistryPredicate
+    __implements__ = z2IContentTypeRegistryPredicate
+    implements(IContentTypeRegistryPredicate)
 
     major = minor = None
     PREDICATE_TYPE  = 'major_minor'
@@ -125,8 +129,9 @@
         Predicate matching on filename extensions.
     """
 
-    __implements__ = IContentTypeRegistryPredicate
-
+    __implements__ = z2IContentTypeRegistryPredicate
+    implements(IContentTypeRegistryPredicate)
+    
     extensions = None
     PREDICATE_TYPE  = 'extension'
 
@@ -189,7 +194,8 @@
         also be passed).
     """
 
-    __implements__ = IContentTypeRegistryPredicate
+    __implements__ = z2IContentTypeRegistryPredicate
+    implements(IContentTypeRegistryPredicate)
 
     pattern         = None
     PREDICATE_TYPE  = 'mimetype_regex'
@@ -245,8 +251,9 @@
         and 'pattern' can also be passed).
     """
 
-    __implements__ = IContentTypeRegistryPredicate
-
+    #_implements__ = IContentTypeRegistryPredicate
+    implements(IContentTypeRegistryPredicate)
+    
     pattern         = None
     PREDICATE_TYPE  = 'name_regex'
 
@@ -319,7 +326,8 @@
         Registry for rules which map PUT args to a CMF Type Object.
     """
 
-    __implements__ = IContentTypeRegistry
+    __implements__ = z2IContentTypeRegistry
+    implements(IContentTypeRegistry)
 
     meta_type = 'Content Type Registry'
     id = 'content_type_registry'