[Checkins] SVN: z3c.zalchemy/sandbox/src/z3c/zalchemy/ fixed some bugs

[Bernd Dorn]

Log message for revision 67561:
  fixed some bugs

Changed:
  U   z3c.zalchemy/sandbox/src/z3c/zalchemy/browser/configure.zcml
  U   z3c.zalchemy/sandbox/src/z3c/zalchemy/configure.zcml
  U   z3c.zalchemy/sandbox/src/z3c/zalchemy/datamanager.py
  U   z3c.zalchemy/sandbox/src/z3c/zalchemy/metaconfigure.py
  U   z3c.zalchemy/sandbox/src/z3c/zalchemy/metadirectives.py

-=-
Modified: z3c.zalchemy/sandbox/src/z3c/zalchemy/browser/configure.zcml
===================================================================
--- z3c.zalchemy/sandbox/src/z3c/zalchemy/browser/configure.zcml	2006-04-24 06:06:42 UTC (rev 67560)
+++ z3c.zalchemy/sandbox/src/z3c/zalchemy/browser/configure.zcml	2006-04-24 07:27:33 UTC (rev 67561)
@@ -4,7 +4,7 @@
            >
 
   <browser:addMenuItem
-      class="zalchemy.container.SQLAlchemyContainer"
+      class="z3c.zalchemy.container.SQLAlchemyContainer"
       title="SQLAlchemy Container"
       description="A persistent container for mapped SQLAlchemy instances"
       permission="zope.ManageContent"
@@ -14,14 +14,14 @@
   <browser:addform
       for="*"
       name="addSQLAlchemyContainer.html"
-      content_factory="zalchemy.container.SQLAlchemyContainer"
-      schema="zalchemy.interfaces.ISQLAlchemyContainer"
+      content_factory="z3c.zalchemy.container.SQLAlchemyContainer"
+      schema="z3c.zalchemy.interfaces.ISQLAlchemyContainer"
       set_before_add="className"
       permission="zope.ManageContent"
       />
 
   <browser:containerViews
-      for="zalchemy.interfaces.ISQLAlchemyContainer"
+      for="z3c.zalchemy.interfaces.ISQLAlchemyContainer"
       index="zope.View"
       contents="zope.View"
       add="zope.ManageContent"

Modified: z3c.zalchemy/sandbox/src/z3c/zalchemy/configure.zcml
===================================================================
--- z3c.zalchemy/sandbox/src/z3c/zalchemy/configure.zcml	2006-04-24 06:06:42 UTC (rev 67560)
+++ z3c.zalchemy/sandbox/src/z3c/zalchemy/configure.zcml	2006-04-24 07:27:33 UTC (rev 67561)
@@ -7,7 +7,7 @@
   <class class=".container.SQLAlchemyContainer">
 
     <factory
-        id="zalchemy.container.SQLAlchemyContainer"
+        id="z3c.zalchemy.container.SQLAlchemyContainer"
         title="SQLAlchemy Container"
         description="A container for mapped sqlalchemy instances" />
 
@@ -25,13 +25,13 @@
 
   <adapter
       provides="zope.app.container.interfaces.INameChooser"
-      for="zalchemy.interfaces.ISQLAlchemyContainer"
+      for="z3c.zalchemy.interfaces.ISQLAlchemyContainer"
       permission="zope.Public"
-      factory="zalchemy.container.SQLAlchemyNameChooser"
+      factory="z3c.zalchemy.container.SQLAlchemyNameChooser"
       />
 
   <subscriber
-     handler="zalchemy.datamanager.beforeTraversal"
+     handler="z3c.zalchemy.datamanager.beforeTraversal"
      for="zope.app.publication.interfaces.IBeforeTraverseEvent"
      trusted="True"
      />

Modified: z3c.zalchemy/sandbox/src/z3c/zalchemy/datamanager.py
===================================================================
--- z3c.zalchemy/sandbox/src/z3c/zalchemy/datamanager.py	2006-04-24 06:06:42 UTC (rev 67560)
+++ z3c.zalchemy/sandbox/src/z3c/zalchemy/datamanager.py	2006-04-24 07:27:33 UTC (rev 67561)
@@ -32,7 +32,8 @@
     """
     implements(IAlchemyEngineUtility)
     
-    def __init__(self, name, dns, echo=False, encoding=None, **kwargs):
+    def __init__(self, name, dns, echo=False, encoding=u'utf-8',
+                 **kwargs):
         self.name = name
         self.dns = dns
         self.echo = echo

Modified: z3c.zalchemy/sandbox/src/z3c/zalchemy/metaconfigure.py
===================================================================
--- z3c.zalchemy/sandbox/src/z3c/zalchemy/metaconfigure.py	2006-04-24 06:06:42 UTC (rev 67560)
+++ z3c.zalchemy/sandbox/src/z3c/zalchemy/metaconfigure.py	2006-04-24 07:27:33 UTC (rev 67561)
@@ -17,8 +17,9 @@
 from datamanager import AlchemyEngineUtility
 from interfaces import IAlchemyEngineUtility
 
-def engine(_context, name, dns, echo=False, **kwargs):
-    component = AlchemyEngineUtility(name, dns, echo, **kwargs)
+def engine(_context, name, dns, echo=False, encoding=u'utf-8', **kwargs):
+    component = AlchemyEngineUtility(name, dns, echo=echo,
+                                     encoding=encoding,**kwargs)
     utility(_context,
             IAlchemyEngineUtility,
             component,

Modified: z3c.zalchemy/sandbox/src/z3c/zalchemy/metadirectives.py
===================================================================
--- z3c.zalchemy/sandbox/src/z3c/zalchemy/metadirectives.py	2006-04-24 06:06:42 UTC (rev 67560)
+++ z3c.zalchemy/sandbox/src/z3c/zalchemy/metadirectives.py	2006-04-24 07:27:33 UTC (rev 67561)
@@ -33,7 +33,7 @@
                 )
 
     encoding = schema.TextLine(title=u'Encoding',
-                               default=None,
+                               default=u'utf-8',
                                required=False)
 
 # Arbitrary keys and values are allowed to be passed to the viewlet.