[Zope3-checkins] CVS: Zope3/src/zope/documenttemplate - documenttemplate.py:1.1.2.2 dt_string.py:1.1.2.2

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/documenttemplate
In directory cvs.zope.org:/tmp/cvs-serv8404

Modified Files:
      Tag: NameGeddon-branch
	documenttemplate.py dt_string.py 
Log Message:
Got tests passing

=== Zope3/src/zope/documenttemplate/documenttemplate.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/documenttemplate/documenttemplate.py:1.1.2.1	Mon Dec 23 14:32:46 2002
+++ Zope3/src/zope/documenttemplate/documenttemplate.py	Mon Dec 23 16:12:14 2002
@@ -72,10 +72,10 @@
 
 Document Templates may be created 2 ways by default:
 
-    DocumentTemplate.String -- Creates a document templated from a
+    documenttemplate.String -- Creates a document templated from a
         string using an extended form of python string formatting.
 
-    DocumentTemplate.HTML -- Creates a document templated from a
+    documenttemplate.HTML -- Creates a document templated from a
         string using HTML server-side-include rather than
         python-format-string syntax.
 


=== Zope3/src/zope/documenttemplate/dt_string.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/documenttemplate/dt_string.py:1.1.2.1	Mon Dec 23 14:32:46 2002
+++ Zope3/src/zope/documenttemplate/dt_string.py	Mon Dec 23 16:12:14 2002
@@ -62,15 +62,15 @@
     commands={
         'var': Var,
         'call': Call,
-        'in': ('in', 'DT_In','In'),
-        'with': ('with', 'DT_With','With'),
-        'if': ('if', 'DT_If','If'),
-        'unless': ('unless', 'DT_If','Unless'),
-        'else': ('else', 'DT_If','Else'),
+        'in': ('in', 'dt_in','In'),
+        'with': ('with', 'dt_with','With'),
+        'if': ('if', 'dt_if','If'),
+        'unless': ('unless', 'dt_if','Unless'),
+        'else': ('else', 'dt_if','Else'),
         'comment': Comment,
-        'raise': ('raise', 'DT_Raise','Raise'),
-        'try': ('try', 'DT_Try','Try'),
-        'let': ('let', 'DT_Let', 'Let'),
+        'raise': ('raise', 'dt_raise','Raise'),
+        'try': ('try', 'dt_try','Try'),
+        'let': ('let', 'dt_let', 'Let'),
         'return': ReturnTag,
         }
 
@@ -98,7 +98,7 @@
             try:
                 exec 'from %s import %s' % (module, name) in d
             except ImportError:
-                exec 'from Zope.DocumentTemplate.%s import %s' % (module,
+                exec 'from zope.documenttemplate.%s import %s' % (module,
                                                                   name) in d
             command = d[name]
             self.commands[cname] = command