[Zope-Checkins] CVS: Zope/lib/python/DocumentTemplate - DT_Util.py:1.89.12.2 pDocumentTemplate.py:1.41.44.1

[Casey Duncan]

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

Modified Files:
      Tag: Zope-2_7-branch
	DT_Util.py pDocumentTemplate.py 
Log Message:
Unhinge pDocumentTemplate so it is no longer ever imported. (issue #562)


=== Zope/lib/python/DocumentTemplate/DT_Util.py 1.89.12.1 => 1.89.12.2 ===
--- Zope/lib/python/DocumentTemplate/DT_Util.py:1.89.12.1	Thu Jan  8 18:33:46 2004
+++ Zope/lib/python/DocumentTemplate/DT_Util.py	Thu Apr 29 16:34:29 2004
@@ -38,12 +38,9 @@
             if type(v) is st: v=int(v)
     return v or 0
 
-try:
-    import ExtensionClass
-    from cDocumentTemplate import InstanceDict, TemplateDict, \
-         render_blocks, safe_callable, join_unicode
-except: from pDocumentTemplate import InstanceDict, TemplateDict, \
-        render_blocks, safe_callable, join_unicode
+import ExtensionClass
+from cDocumentTemplate import InstanceDict, TemplateDict, \
+     render_blocks, safe_callable, join_unicode
 
 functype = type(int_param)
 class NotBindable:


=== Zope/lib/python/DocumentTemplate/pDocumentTemplate.py 1.41 => 1.41.44.1 ===
--- Zope/lib/python/DocumentTemplate/pDocumentTemplate.py:1.41	Tue Sep 24 18:25:57 2002
+++ Zope/lib/python/DocumentTemplate/pDocumentTemplate.py	Thu Apr 29 16:34:29 2004
@@ -12,12 +12,20 @@
 ##############################################################################
 """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]
 
 import sys, types
 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]