[Zope-Checkins] CVS: Zope/lib/python/DocumentTemplate - DT_Util.py:1.92 pDocumentTemplate.py:1.42

[Casey Duncan]

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

Modified Files:
	DT_Util.py pDocumentTemplate.py 
Log Message:
Fix test so that is creates a new user folder, rather than borrowing the one *ac
tually in the root*. This could cause the tests to fail if you had a user folder with any users in it.


=== Zope/lib/python/DocumentTemplate/DT_Util.py 1.91 => 1.92 ===
--- Zope/lib/python/DocumentTemplate/DT_Util.py:1.91	Fri Dec 26 18:43:11 2003
+++ Zope/lib/python/DocumentTemplate/DT_Util.py	Thu Apr 29 17:17:08 2004
@@ -10,8 +10,9 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-'''$Id$'''
-__version__='$Revision$'[11:-2]
+"""DTML Utilities
+
+$Id$"""
 
 import re
 
@@ -19,6 +20,8 @@
 from RestrictedPython.Guards import safe_builtins
 from RestrictedPython.Utilities import utility_builtins
 from RestrictedPython.Eval import RestrictionCapableEval
+from cDocumentTemplate import InstanceDict, TemplateDict, \
+         render_blocks, safe_callable, join_unicode
 
 test = utility_builtins['test'] # for backwards compatibility, dont remove!
 
@@ -39,13 +42,6 @@
             if isinstance(v, str):
                 v = int(v)
     return v or 0
-
-try:
-    from cDocumentTemplate import InstanceDict, TemplateDict, \
-         render_blocks, safe_callable, join_unicode
-except:
-    from pDocumentTemplate import InstanceDict, TemplateDict, \
-         render_blocks, safe_callable, join_unicode
 
 functype = type(int_param)
 class NotBindable:


=== Zope/lib/python/DocumentTemplate/pDocumentTemplate.py 1.41 => 1.42 ===
--- Zope/lib/python/DocumentTemplate/pDocumentTemplate.py:1.41	Tue Sep 24 18:25:57 2002
+++ Zope/lib/python/DocumentTemplate/pDocumentTemplate.py	Thu Apr 29 17:17:08 2004
@@ -12,6 +12,9 @@
 ##############################################################################
 """Python implementations of document template some features
 
+XXX This module is no longer actively used, but is left as an
+XXX implementation reference for cDocumentTemplate
+
 $Id$"""
 __version__='$Revision$'[11:-2]
 
@@ -19,6 +22,11 @@
 from types import StringType, UnicodeType, TupleType
 from ustr import ustr
 
+import warnings
+warnings.warn('pDocumentTemplate is not longer in active use. '
+              'It remains only as an implementation reference.',
+              DeprecationWarning)
+              
 ClassTypes = [types.ClassType]
 
 try: