[CMF-checkins] CVS: CMF/CMFCore - ContentTypeRegistry.py:1.11.12.2 PortalContent.py:1.39.12.2

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv16855/CMFCore

Modified Files:
      Tag: yuppie-collector096-branch
	ContentTypeRegistry.py PortalContent.py 
Log Message:
branch cleanup, preparing for merge

=== CMF/CMFCore/ContentTypeRegistry.py 1.11.12.1 => 1.11.12.2 ===
--- CMF/CMFCore/ContentTypeRegistry.py:1.11.12.1	Fri Dec 20 11:38:59 2002
+++ CMF/CMFCore/ContentTypeRegistry.py	Mon Jan  6 06:58:25 2003
@@ -87,7 +87,6 @@
         """
             Return true if the rule matches, else false.
         """
-        SLASH_SPLIT = re.compile( '/' )
         if self.major is None:
             return 0
 
@@ -97,7 +96,7 @@
         typ = typ or '/'
         if not '/' in typ:
             typ = typ + '/'
-        major, minor = SLASH_SPLIT.split( typ )
+        major, minor = typ.split('/', 1)
 
         if self.major and not major in self.major:
             return 0


=== CMF/CMFCore/PortalContent.py 1.39.12.1 => 1.39.12.2 ===
--- CMF/CMFCore/PortalContent.py:1.39.12.1	Fri Dec 20 11:39:00 2002
+++ CMF/CMFCore/PortalContent.py	Mon Jan  6 06:58:25 2003
@@ -55,9 +55,9 @@
     """
     
     if not NoWL:
-        __implements__ = (WriteLockInterface
-                         ,Contentish
-                         ,DynamicType.__implements__)
+        __implements__ = (WriteLockInterface,
+                          Contentish,
+                          DynamicType.__implements__)
     else:
         __implements__ = (Contentish, DynamicType.__implements__)