[Checkins] SVN: Products.GenericSetup/branches/1.4-with-global-zca/ fix broken after merge

[Godefroid Chapelle]

Log message for revision 121286:
  fix broken after merge

Changed:
  U   Products.GenericSetup/branches/1.4-with-global-zca/Products/GenericSetup/registry.py
  U   Products.GenericSetup/branches/1.4-with-global-zca/buildout.cfg

-=-
Modified: Products.GenericSetup/branches/1.4-with-global-zca/Products/GenericSetup/registry.py
===================================================================
--- Products.GenericSetup/branches/1.4-with-global-zca/Products/GenericSetup/registry.py	2011-04-05 13:24:24 UTC (rev 121285)
+++ Products.GenericSetup/branches/1.4-with-global-zca/Products/GenericSetup/registry.py	2011-04-05 13:33:53 UTC (rev 121286)
@@ -24,6 +24,7 @@
 import App.Product
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from zope.interface import implements
+from zope.component import getGlobalSiteManager
 from warnings import warn
 
 from interfaces import BASE
@@ -31,6 +32,9 @@
 from interfaces import IExportStepRegistry
 from interfaces import IToolsetRegistry
 from interfaces import IProfileRegistry
+from interfaces import IImportStep
+from interfaces import IExportStep
+from interfaces import IProfile
 from permissions import ManagePortal
 from metadata import ProfileMetadata
 from utils import _xmldir
@@ -323,10 +327,9 @@
 
         o Return 'default' if no such step is registered.
         """
-        marker = object()
-        info = self._registered.get( key, marker )
+        info = self._registered.get( key )
 
-        if info is marker:
+        if info is None:
             return default
 
         return _resolveDottedName( info[ 'handler' ] )
@@ -805,5 +808,3 @@
 InitializeClass( ProfileRegistry )
 
 _profile_registry = ProfileRegistry()
-
-

Modified: Products.GenericSetup/branches/1.4-with-global-zca/buildout.cfg
===================================================================
--- Products.GenericSetup/branches/1.4-with-global-zca/buildout.cfg	2011-04-05 13:24:24 UTC (rev 121285)
+++ Products.GenericSetup/branches/1.4-with-global-zca/buildout.cfg	2011-04-05 13:33:53 UTC (rev 121286)
@@ -13,6 +13,7 @@
 [versions]
 zc.recipe.testrunner = 1.2.0
 zope.testing = 3.9.5
+Products.GenericSetup = 
 
 [zope2]
 recipe = plone.recipe.zope2install