[Zodb-checkins] CVS: Zope/lib/python/ZConfig - BRANCHES.txt:1.1.4.3 Config.py:1.2.4.8 Context.py:1.1.4.8 __init__.py:1.1.4.10

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/ZConfig
In directory cvs.zope.org:/tmp/cvs-serv2264

Modified Files:
      Tag: chrism-install-branch
	BRANCHES.txt Config.py Context.py __init__.py 
Log Message:
Merge with HEAD.


=== Zope/lib/python/ZConfig/BRANCHES.txt 1.1.4.2 => 1.1.4.3 ===
--- Zope/lib/python/ZConfig/BRANCHES.txt:1.1.4.2	Fri Jan  3 10:51:55 2003
+++ Zope/lib/python/ZConfig/BRANCHES.txt	Sat Jan  4 13:10:47 2003
@@ -3,12 +3,14 @@
 ZConfig package.
 
 zconfig-brace-syntax
+    NOT ACTIVE
     An example of an alternate syntax for ZConfig.  This syntax was
     developed while trying the package initially, but was rejected.
     It is saved on a branch to avoid losing historical information.
 
 zconfig-schema-devel-branch
+    NOT ACTIVE
     Development branch for schema support in ZConfig.  The branch is
     based on the ZConfig trunk, but the development is strongly based
     on the work Chris McDonough started in the chrism-install-branch
-    for Zope 2.
+    for Zope 2.  This was merged into the trunk on 3-Jan-2002.


=== Zope/lib/python/ZConfig/Config.py 1.2.4.7 => 1.2.4.8 ===
--- Zope/lib/python/ZConfig/Config.py:1.2.4.7	Fri Jan  3 10:51:55 2003
+++ Zope/lib/python/ZConfig/Config.py	Sat Jan  4 13:10:47 2003
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors.
+# Copyright (c) 2002, 2003 Zope Corporation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,


=== Zope/lib/python/ZConfig/Context.py 1.1.4.7 => 1.1.4.8 ===
--- Zope/lib/python/ZConfig/Context.py:1.1.4.7	Fri Jan  3 10:51:55 2003
+++ Zope/lib/python/ZConfig/Context.py	Sat Jan  4 13:10:47 2003
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors.
+# Copyright (c) 2002, 2003 Zope Corporation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
@@ -13,13 +13,13 @@
 ##############################################################################
 """Top-level configuration handle."""
 
-import urlparse
-
 import ZConfig
 
 from ZConfig import loader
 from ZConfig.Config import Configuration
 
+from ZConfig import loader
+from ZConfig.Config import Configuration
 
 class Context(loader.BaseLoader):
 


=== Zope/lib/python/ZConfig/__init__.py 1.1.4.9 => 1.1.4.10 ===
--- Zope/lib/python/ZConfig/__init__.py:1.1.4.9	Fri Jan  3 10:51:55 2003
+++ Zope/lib/python/ZConfig/__init__.py	Sat Jan  4 13:10:47 2003
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors.
+# Copyright (c) 2002, 2003 Zope Corporation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,