[Checkins] SVN: zope.generic/trunk/src/zope/generic/ fix typo

[Dominik Huber]

Log message for revision 68412:
  fix typo

Changed:
  U   zope.generic/trunk/src/zope/generic/adapter/property.py
  U   zope.generic/trunk/src/zope/generic/configuration/adapter.py
  U   zope.generic/trunk/src/zope/generic/configuration/api.py
  U   zope.generic/trunk/src/zope/generic/configuration/helper.py
  U   zope.generic/trunk/src/zope/generic/face/api.py
  U   zope.generic/trunk/src/zope/generic/face/helper.py
  U   zope.generic/trunk/src/zope/generic/factory/factory.py

-=-
Modified: zope.generic/trunk/src/zope/generic/adapter/property.py
===================================================================
--- zope.generic/trunk/src/zope/generic/adapter/property.py	2006-05-31 15:20:19 UTC (rev 68411)
+++ zope.generic/trunk/src/zope/generic/adapter/property.py	2006-05-31 16:58:12 UTC (rev 68412)
@@ -20,7 +20,7 @@
 
 from zope.generic.configuration import IConfigurations
 from zope.generic.configuration.base import createConfiguration
-from zope.generic.configuration.helper import configuratonToDict
+from zope.generic.configuration.helper import configurationToDict
 from zope.generic.informationprovider.api import getInformation
 from zope.generic.informationprovider.api import getInformationProvider
 
@@ -125,7 +125,7 @@
                 if not configuration:
                     raise
 
-                data = configuratonToDict(configuration)
+                data = configurationToDict(configuration)
                 data[self._name] = value
                 configurations[keyface] = createConfiguration(keyface, data)
 

Modified: zope.generic/trunk/src/zope/generic/configuration/adapter.py
===================================================================
--- zope.generic/trunk/src/zope/generic/configuration/adapter.py	2006-05-31 15:20:19 UTC (rev 68411)
+++ zope.generic/trunk/src/zope/generic/configuration/adapter.py	2006-05-31 16:58:12 UTC (rev 68412)
@@ -38,7 +38,7 @@
 from zope.generic.configuration.base import createConfiguration
 from zope.generic.configuration.event import Configuration
 from zope.generic.configuration.event import ObjectConfiguredEvent
-from zope.generic.configuration.helper import configuratonToDict
+from zope.generic.configuration.helper import configurationToDict
 
 
 
@@ -166,7 +166,7 @@
             if isinstance(value, dict):
                 data = value
             else:
-                data = configuratonToDict(value, all=True)
+                data = configurationToDict(value, all=True)
             notify(ObjectConfiguredEvent(parent, 
                 Configuration(keyface, data)))
 

Modified: zope.generic/trunk/src/zope/generic/configuration/api.py
===================================================================
--- zope.generic/trunk/src/zope/generic/configuration/api.py	2006-05-31 15:20:19 UTC (rev 68411)
+++ zope.generic/trunk/src/zope/generic/configuration/api.py	2006-05-31 16:58:12 UTC (rev 68412)
@@ -23,7 +23,7 @@
 from zope.generic.configuration import *
 from zope.generic.configuration.adapter import AttributeConfigurations
 from zope.generic.configuration.base import createConfiguration
-from zope.generic.configuration.helper import configuratonToDict
+from zope.generic.configuration.helper import configurationToDict
 from zope.generic.configuration.helper import provideConfigurationType
 from zope.generic.configuration.helper import namesInOrder
 

Modified: zope.generic/trunk/src/zope/generic/configuration/helper.py
===================================================================
--- zope.generic/trunk/src/zope/generic/configuration/helper.py	2006-05-31 15:20:19 UTC (rev 68411)
+++ zope.generic/trunk/src/zope/generic/configuration/helper.py	2006-05-31 16:58:12 UTC (rev 68412)
@@ -35,7 +35,7 @@
 
 _marker = object()
 
-def configuratonToDict(configuration, all=False):
+def configurationToDict(configuration, all=False):
     """Extract values from configuration to a dictionary.
 
     First we have to specify a test configurtion interface:
@@ -52,11 +52,11 @@
 
         >>> from zope.generic.configuration.base import createConfiguration
         >>> configuration = createConfiguration(IAnyConfiguration, {'a': u'a bla'})
-        >>> api.configuratonToDict(configuration)
+        >>> api.configurationToDict(configuration)
         {'a': u'a bla'}
 
     Including defaults:
-        >>> api.configuratonToDict(configuration, all=True)
+        >>> api.configurationToDict(configuration, all=True)
         {'a': u'a bla', 'c': u'c default', 'b': None}
 
     """
@@ -78,7 +78,7 @@
             else:
                 if all:
                     data[name] = field.default
-        
+
         elif value is not _marker:
             data[name] = value
 

Modified: zope.generic/trunk/src/zope/generic/face/api.py
===================================================================
--- zope.generic/trunk/src/zope/generic/face/api.py	2006-05-31 15:20:19 UTC (rev 68411)
+++ zope.generic/trunk/src/zope/generic/face/api.py	2006-05-31 16:58:12 UTC (rev 68412)
@@ -25,6 +25,7 @@
 from zope.generic.face.helper import toDottedName
 from zope.generic.face.helper import toFaceTuple
 from zope.generic.face.helper import toInterface
+from zope.generic.face.helper import unicodeDictToStrDict
 
 
 

Modified: zope.generic/trunk/src/zope/generic/face/helper.py
===================================================================
--- zope.generic/trunk/src/zope/generic/face/helper.py	2006-05-31 15:20:19 UTC (rev 68411)
+++ zope.generic/trunk/src/zope/generic/face/helper.py	2006-05-31 16:58:12 UTC (rev 68412)
@@ -48,7 +48,13 @@
         return __name_to_component.setdefault(dottedname, resolve(dottedname))
 
 
+def unicodeDictToStrDict(data):
+    strDict = {}
+    [strDict.__setitem__(str(key), value) for key, value in data.items()]
+    return strDict
 
+
+
 def toDescription(component, label=None, hint=None):
     """Use the __doc__ attribute for label and hint.
 

Modified: zope.generic/trunk/src/zope/generic/factory/factory.py
===================================================================
--- zope.generic/trunk/src/zope/generic/factory/factory.py	2006-05-31 15:20:19 UTC (rev 68411)
+++ zope.generic/trunk/src/zope/generic/factory/factory.py	2006-05-31 16:58:12 UTC (rev 68412)
@@ -24,7 +24,7 @@
 from zope.interface import alsoProvides
 
 from zope.generic.configuration.api import parameterToConfiguration
-from zope.generic.configuration.api import configuratonToDict
+from zope.generic.configuration.api import configurationToDict
 from zope.generic.directlyprovides.api import updateDirectlyProvided
 from zope.generic.informationprovider.api import getInformationProvider
 from zope.generic.informationprovider.api import provideInformation
@@ -245,7 +245,7 @@
 
             # callables with defined parameters
             else:
-                new_kws = configuratonToDict(parameterToConfiguration(config.input, *pos, **kws), all=True)
+                new_kws = configurationToDict(parameterToConfiguration(config.input, *pos, **kws), all=True)
                 instance = self._callable(**new_kws)
 
         # handle undeclared ones