[Zope-Checkins] CVS: Packages/ZConfig - Substitution.py:1.7

Fred L. Drake, Jr. fred@zope.com
Tue, 3 Dec 2002 10:01:08 -0500


Update of /cvs-repository/Packages/ZConfig
In directory cvs.zope.org:/tmp/cvs-serv1794

Modified Files:
	Substitution.py 
Log Message:
_interp():  Be sure to pass along the context to _split().
_split():  The second parameter doesn't need to be optional.


=== Packages/ZConfig/Substitution.py 1.6 => 1.7 ===
--- Packages/ZConfig/Substitution.py:1.6	Tue Dec  3 09:37:50 2002
+++ Packages/ZConfig/Substitution.py	Tue Dec  3 10:01:08 2002
@@ -52,7 +52,7 @@
 
 def _interp(accum, rest, section, context):
     while 1:
-        s, name, rest = _split(rest)
+        s, name, rest = _split(rest, context)
         if s:
             accum.append(s)
         if name:
@@ -76,7 +76,7 @@
             return
 
 
-def _split(s, context=None):
+def _split(s, context):
     # Return a triple:  prefix, name, suffix
     # - prefix is text that can be used literally in the result (may be '')
     # - name is a referenced name, or None