[Zope3-checkins] CVS: Zope3/src/zope/configuration - hookregistry.py:1.1.2.2 name.py:1.1.2.2 xmlconfig.py:1.1.2.2

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/configuration
In directory cvs.zope.org:/tmp/cvs-serv7328

Modified Files:
      Tag: NameGeddon-branch
	hookregistry.py name.py xmlconfig.py 
Log Message:
Got tests passing

=== Zope3/src/zope/configuration/hookregistry.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/configuration/hookregistry.py:1.1.2.1	Mon Dec 23 14:32:42 2002
+++ Zope3/src/zope/configuration/hookregistry.py	Mon Dec 23 16:05:13 2002
@@ -17,7 +17,7 @@
 
 from types import ModuleType
 from zope.exceptions import DuplicationError, NotFoundError, ZopeError
-import zope.configuration.name
+from zope.configuration import name
 
 class MissingHookableError(NotFoundError):
     """the stated hook has not been registered"""


=== Zope3/src/zope/configuration/name.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/configuration/name.py:1.1.2.1	Mon Dec 23 14:32:42 2002
+++ Zope3/src/zope/configuration/name.py	Mon Dec 23 16:05:13 2002
@@ -20,7 +20,7 @@
 import sys
 from types import ModuleType
 
-def resolve(name, package='ZopeProducts', _silly=('__doc__',), _globals={}):
+def resolve(name, package='zopeproducts', _silly=('__doc__',), _globals={}):
     name = name.strip()
     
     if name.startswith('.'):
@@ -72,7 +72,7 @@
         name+="+"
     return name
 
-def path(file='', package = 'ZopeProducts', _silly=('__doc__',), _globals={}):
+def path(file='', package = 'zopeproducts', _silly=('__doc__',), _globals={}):
     try: package = __import__(package, _globals, _globals, _silly)
     except ImportError:
         if file and os.path.abspath(file) == file:


=== Zope3/src/zope/configuration/xmlconfig.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/configuration/xmlconfig.py:1.1.2.1	Mon Dec 23 14:32:42 2002
+++ Zope3/src/zope/configuration/xmlconfig.py	Mon Dec 23 16:05:13 2002
@@ -17,7 +17,7 @@
 """
 
 import os
-import zope.configuration.name
+from zope.configuration import name
 from os.path import abspath
 from xml.sax import make_parser
 from xml.sax.xmlreader import InputSource
@@ -183,7 +183,7 @@
         if module is _NO_MODULE_GIVEN:
             self.__package = None
         elif module is None:
-            self.__package = 'ZopeProducts'
+            self.__package = 'zopeproducts'
         else:
             self.__package = module.__name__