[Zope-CVS] CVS: Products/Ape/lib/apelib/zodb3 - db.py:1.3
Shane Hathaway
shane@zope.com
Wed, 4 Jun 2003 11:44:46 -0400
Update of /cvs-repository/Products/Ape/lib/apelib/zodb3
In directory cvs.zope.org:/tmp/cvs-serv26438
Modified Files:
db.py
Log Message:
Fixed the argument signature for callMapperFactory()
=== Products/Ape/lib/apelib/zodb3/db.py 1.2 => 1.3 ===
--- Products/Ape/lib/apelib/zodb3/db.py:1.2 Tue Apr 29 18:11:51 2003
+++ Products/Ape/lib/apelib/zodb3/db.py Wed Jun 4 11:44:45 2003
@@ -58,16 +58,19 @@
version_pool_size=3,
version_cache_size=100,
version_cache_deactivate_after=10,
+ **kw
):
"""Create an object database.
"""
if mapper_resource is None:
if factory is not None:
# Use a mapper factory
- mapper, connections = callMapperFactory(factory)
+ mapper, connections = callMapperFactory(factory, kw)
assert IMapper.isImplementedBy(mapper)
mapper_resource = StaticResource(mapper)
else:
+ if kw:
+ raise ConfigurationError('Extra keyword args: %s' % kw)
if isinstance(storage, ApeStorage):
# Use the mapper from the storage
mapper_resource = storage.getMapperResource()
@@ -75,6 +78,8 @@
raise ConfigurationError('No mapper or factory specified')
else:
# mapper_resource was specified
+ if kw:
+ raise ConfigurationError('Extra keyword args: %s' % kw)
assert IResourceAccess.isImplementedBy(mapper_resource)
assert factory is None