[Zope-Checkins] SVN: Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/ - Some PEP-328 related changes. Need to make imports conditionally

[Sidnei da Silva]

Log message for revision 91894:
  - Some PEP-328 related changes. Need to make imports conditionally
relative using new syntax so that they work on Python 2.6.
  
  

Changed:
  U   Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_Return.py
  U   Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_String.py
  U   Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_Util.py
  U   Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_Var.py
  U   
Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DocumentTemplate.py
  U   
Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/cDocumentTemplate.c

-=-
Modified: Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_Return.py
===
--- Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_Return.py  
2008-10-08 05:02:37 UTC (rev 91893)
+++ Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_Return.py  
2008-10-08 06:43:00 UTC (rev 91894)
@@ -12,7 +12,11 @@
 ##
 __version__='$Revision: 1.9 $'[11:-2]
 
-from DT_Util import parse_params, name_param
+try:
+from DT_Util import parse_params, name_param
+except ImportError:
+# See PEP-328
+from .DT_Util import parse_params, name_param
 
 class ReturnTag:
 name='return'

Modified: Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_String.py
===
--- Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_String.py  
2008-10-08 05:02:37 UTC (rev 91893)
+++ Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_String.py  
2008-10-08 06:43:00 UTC (rev 91894)
@@ -16,9 +16,17 @@
 import thread
 import re
 
-from DT_Util import ParseError, InstanceDict, TemplateDict, render_blocks, str
-from DT_Var import Var, Call, Comment
-from DT_Return import ReturnTag, DTReturn
+try:
+from DT_Util import ParseError, InstanceDict
+from DT_Util import TemplateDict, render_blocks, str
+from DT_Var import Var, Call, Comment
+from DT_Return import ReturnTag, DTReturn
+except ImportError:
+# See PEP-328
+from .DT_Util import ParseError, InstanceDict
+from .DT_Util import TemplateDict, render_blocks, str
+from .DT_Var import Var, Call, Comment
+from .DT_Return import ReturnTag, DTReturn
 
 _marker = []  # Create a new marker object.
 

Modified: Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_Util.py
===
--- Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_Util.py
2008-10-08 05:02:37 UTC (rev 91893)
+++ Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_Util.py
2008-10-08 06:43:00 UTC (rev 91894)
@@ -16,12 +16,25 @@
 
 import re
 
-from html_quote import html_quote, ustr # for import by other modules, dont 
remove!
+try:
+# for import by other modules, dont remove!
+from html_quote import html_quote, ustr
+
+from cDocumentTemplate import InstanceDict, TemplateDict
+from cDocumentTemplate import render_blocks, safe_callable
+from cDocumentTemplate import join_unicode
+except ImportError:
+# See PEP-328: 
+# for import by other modules, dont remove!
+from .html_quote import html_quote, ustr
+
+from .cDocumentTemplate import InstanceDict, TemplateDict
+from .cDocumentTemplate import render_blocks, safe_callable
+from .cDocumentTemplate import join_unicode
+
 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!
 

Modified: Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_Var.py
===
--- Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_Var.py 
2008-10-08 05:02:37 UTC (rev 91893)
+++ Zope/branches/gsoc-python-2.5/lib/python/DocumentTemplate/DT_Var.py 
2008-10-08 06:43:00 UTC (rev 91894)
@@ -151,14 +151,22 @@
 
 
 ''' # '
+
 __rcs_id__='$Id$'
 __version__='$Revision: 1.60 $'[11:-2]
 
+import string, re, sys
 from cgi import escape
-import string, re,  sys
 from urllib import quote, quote_plus, unquote, unquote_plus
-from DT_Util import parse_params, name_param, str, ustr
-from html_quote import html_quote # for import by other modules, dont remove!
+
+try:
+# for import by other modules, dont remove!
+from html_quote import html_quote
+from DT_Util import parse_params, name_param, str, ustr
+except ImportError:
+from .html_quote import html_quote
+from .DT_Util import parse_params, name_param, str, ustr
+
 from Acquisition import 

[Zope-Checkins] SVN: Zope/branches/gsoc-python-2.5/lib/python/Zope2/App/ - Raising a string exception generates a TypeError on Python

[Sidnei da Silva]

Log message for revision 91896:
  - Raising a string exception generates a TypeError on Python
2.6. Adjust tests accordingly.
  
  

Changed:
  U   Zope/branches/gsoc-python-2.5/lib/python/Zope2/App/startup.py
  U   
Zope/branches/gsoc-python-2.5/lib/python/Zope2/App/tests/testExceptionHook.py

-=-
Modified: Zope/branches/gsoc-python-2.5/lib/python/Zope2/App/startup.py
===
--- Zope/branches/gsoc-python-2.5/lib/python/Zope2/App/startup.py   
2008-10-08 06:50:37 UTC (rev 91895)
+++ Zope/branches/gsoc-python-2.5/lib/python/Zope2/App/startup.py   
2008-10-08 06:58:04 UTC (rev 91896)
@@ -207,8 +207,9 @@
 else:
 error_log_url = log.raising((t, v, traceback))
 
-if (getattr(REQUEST.get('RESPONSE', None), '_error_format', '')
-!='text/html'):
+if (REQUEST is None or 
+(getattr(REQUEST.get('RESPONSE', None), '_error_format', '')
+ != 'text/html')):
 raise t, v, traceback
 
 # Lookup a view for the exception and render it, then

Modified: 
Zope/branches/gsoc-python-2.5/lib/python/Zope2/App/tests/testExceptionHook.py
===
--- 
Zope/branches/gsoc-python-2.5/lib/python/Zope2/App/tests/testExceptionHook.py   
2008-10-08 06:50:37 UTC (rev 91895)
+++ 
Zope/branches/gsoc-python-2.5/lib/python/Zope2/App/tests/testExceptionHook.py   
2008-10-08 06:58:04 UTC (rev 91896)
@@ -118,12 +118,20 @@
 def testStringException1(self):
 def f():
 raise 'unauthorized', 'x'
-self.assertRaises('unauthorized', self.call, None, None, f)
+if sys.version_info  (2, 6):
+self.assertRaises('unauthorized', self.call, None, None, f)
+else:
+# Raising a string exception causes a TypeError on Python 2.6
+self.assertRaises(TypeError, self.call, None, None, f)
 
 def testStringException2(self):
 def f():
 raise 'redirect', 'x'
-self.assertRaises('redirect', self.call, None, None, f)
+if sys.version_info  (2, 6):
+self.assertRaises('redirect', self.call, None, None, f)
+else:
+# Raising a string exception causes a TypeError on Python 2.6
+self.assertRaises(TypeError, self.call, None, None, f)
 
 def testSystemExit(self):
 def f():

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins