[z3-checkins] r5279 - in z3/sqlos/trunk: . interfaces

[dreamcatcher at codespeak.net]

Author: dreamcatcher
Date: Thu Jun 24 22:38:39 2004
New Revision: 5279

Modified:
   z3/sqlos/trunk/interfaces/__init__.py
   z3/sqlos/trunk/meta.zcml
   z3/sqlos/trunk/metaconfigure.py
Log:
Ops. A wrong handler that was working by luck! Use IFactory, no need for ISQLFactory (yet).

Modified: z3/sqlos/trunk/interfaces/__init__.py
==============================================================================
--- z3/sqlos/trunk/interfaces/__init__.py	(original)
+++ z3/sqlos/trunk/interfaces/__init__.py	Thu Jun 24 22:38:39 2004
@@ -12,14 +12,11 @@
 from zope.schema import TextLine
 from zope.interface import Interface, Attribute
 from sqlobject import NoDefault
-from zope.component import getService, ComponentLookupError, IFactory
+from zope.component import getService, ComponentLookupError
 from zope.schema.vocabulary import SimpleVocabulary
 from zope.schema import Choice, List
 from zope.app.annotation.interfaces import IAttributeAnnotatable
 
-class ISQLObjectFactory(IFactory):
-    """ A marker interface for SQLObject Factories """
-
 class IConnectionName(Interface):
     """A marker interface for providing a connection name"""
 

Modified: z3/sqlos/trunk/meta.zcml
==============================================================================
--- z3/sqlos/trunk/meta.zcml	(original)
+++ z3/sqlos/trunk/meta.zcml	Thu Jun 24 22:38:39 2004
@@ -20,7 +20,7 @@
     <meta:directive
         name="factory"
         schema=".metadirectives.IFactoryDirective"
-        handler=".metaconfigure.factory"
+        handler=".metaconfigure.handler"
         />
 
     <meta:directive

Modified: z3/sqlos/trunk/metaconfigure.py
==============================================================================
--- z3/sqlos/trunk/metaconfigure.py	(original)
+++ z3/sqlos/trunk/metaconfigure.py	Thu Jun 24 22:38:39 2004
@@ -12,29 +12,24 @@
 
 from zope.interface.verify import verifyClass
 from zope.interface import directlyProvides, implements
-from sqlos.interfaces import ISQLObjectFactory, IISQLObject
+from sqlos.interfaces import IISQLObject
 from sqlos.interfaces import IConnectionName
 from zope.app.component.metaconfigure import factory, utility
 from zope.app.component.metaconfigure import PublicPermission, proxify
 from zope.security.checker import getCheckerForInstancesOf
-from zope.component.factory import Factory
+from zope.component.factory import Factory, IFactory
 
 class SQLObjectFactory(Factory):
-    implements(ISQLObjectFactory)
+    implements(IFactory)
 
 def handler(_context, component, id, title=None, description=None):
 
-    component = _context.resolve(component)
+    if isinstance(component, basestring):
+        component = _context.resolve(component)
 
     factoryObj = SQLObjectFactory(component, title, description)
 
-    if title is not None:
-        factoryObj.title = title
-
-    if description is not None:
-        factoryObj.description = description
-
-    utility(_context, ISQLObjectFactory, factoryObj,
+    utility(_context, IFactory, factoryObj,
             permission=PublicPermission, name=id)
 
     if not IISQLObject.providedBy(component):