[Zope3-checkins] CVS: Zope/lib/python/ZConfig/tests/input - importer.conf:1.1.4.2 importsections.conf:1.1.4.2 include.conf:1.1.4.2 include.schema:1.1.2.3 simple.conf:1.1.4.3 simple.schema:1.1.2.3

[Fred L. Drake, Jr.]

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

Modified Files:
      Tag: chrism-install-branch
	importer.conf importsections.conf include.conf include.schema 
	simple.conf simple.schema 
Log Message:
Merge ZConfig trunk into the chrism-install-branch.

=== Zope/lib/python/ZConfig/tests/input/importer.conf 1.1.4.1 => 1.1.4.2 ===
--- Zope/lib/python/ZConfig/tests/input/importer.conf:1.1.4.1	Thu Oct 10 14:29:13 2002
+++ Zope/lib/python/ZConfig/tests/input/importer.conf	Fri Dec  6 11:06:24 2002
@@ -1,3 +1,3 @@
-import simple.conf
+%import simple.conf
 
 var1 def


=== Zope/lib/python/ZConfig/tests/input/importsections.conf 1.1.4.1 => 1.1.4.2 ===
--- Zope/lib/python/ZConfig/tests/input/importsections.conf:1.1.4.1	Thu Oct 10 14:29:13 2002
+++ Zope/lib/python/ZConfig/tests/input/importsections.conf	Fri Dec  6 11:06:24 2002
@@ -6,7 +6,7 @@
 var 2
 </section>
 
-import impsections1.conf
+%import impsections1.conf
 
 <override over-a>
 var a-2


=== Zope/lib/python/ZConfig/tests/input/include.conf 1.1.4.1 => 1.1.4.2 ===
--- Zope/lib/python/ZConfig/tests/input/include.conf:1.1.4.1	Thu Oct 10 14:29:13 2002
+++ Zope/lib/python/ZConfig/tests/input/include.conf	Fri Dec  6 11:06:24 2002
@@ -1,3 +1,3 @@
 var2 value2
-include simple.conf
+%include simple.conf
 var3 value3


=== Zope/lib/python/ZConfig/tests/input/include.schema 1.1.2.2 => 1.1.2.3 ===
--- Zope/lib/python/ZConfig/tests/input/include.schema:1.1.2.2	Thu Nov 21 03:40:40 2002
+++ Zope/lib/python/ZConfig/tests/input/include.schema	Fri Dec  6 11:06:24 2002
@@ -35,4 +35,14 @@
 
   <key name="list-4" class=".TestKey"/>
 
+  <key name="getname" class=".TestKey"/>
+
+  <key name="getnametwice" class=".TestKey"/>
+
+  <key name="getdollars" class=".TestKey"/>
+
+  <key name="getempty" class=".TestKey"/>
+
+  <key name="getwords" class=".TestKey"/>
+
 </schema>


=== Zope/lib/python/ZConfig/tests/input/simple.conf 1.1.4.2 => 1.1.4.3 ===
--- Zope/lib/python/ZConfig/tests/input/simple.conf:1.1.4.2	Sat Oct 26 15:51:48 2002
+++ Zope/lib/python/ZConfig/tests/input/simple.conf	Fri Dec  6 11:06:24 2002
@@ -17,3 +17,16 @@
 list-2 abc
 list-3 abc def ghi
 list-4 	[  what	now? 	]
+
+# These test the %define mechanism:
+
+%define dollars $$
+%define empty
+%define name value
+%define twowords two words
+
+getname $name
+getnametwice $name${name}
+getdollars $dollars
+getempty x${empty}y
+getwords abc $twowords def


=== Zope/lib/python/ZConfig/tests/input/simple.schema 1.1.2.2 => 1.1.2.3 ===
--- Zope/lib/python/ZConfig/tests/input/simple.schema:1.1.2.2	Thu Nov 21 03:40:40 2002
+++ Zope/lib/python/ZConfig/tests/input/simple.schema	Fri Dec  6 11:06:24 2002
@@ -31,5 +31,15 @@
 
   <key name="list-4" class=".TestKey"/>
 
+  <key name="getname" class=".TestKey"/>
+
+  <key name="getnametwice" class=".TestKey"/>
+
+  <key name="getdollars" class=".TestKey"/>
+
+  <key name="getempty" class=".TestKey"/>
+
+  <key name="getwords" class=".TestKey"/>
+
 </schema>