[Checkins] SVN: zope.tal/trunk/src/zope/tal/ Towards Py3K: builtins

Marius Gedminas cvs-admin at zope.org
Thu Feb 7 20:35:56 UTC 2013


Log message for revision 129182:
  Towards Py3K: builtins

Changed:
  U   zope.tal/trunk/src/zope/tal/ndiff.py
  U   zope.tal/trunk/src/zope/tal/talgenerator.py
  U   zope.tal/trunk/src/zope/tal/talinterpreter.py
  U   zope.tal/trunk/src/zope/tal/xmlparser.py

-=-
Modified: zope.tal/trunk/src/zope/tal/ndiff.py
===================================================================
--- zope.tal/trunk/src/zope/tal/ndiff.py	2013-02-07 20:35:53 UTC (rev 129181)
+++ zope.tal/trunk/src/zope/tal/ndiff.py	2013-02-07 20:35:56 UTC (rev 129182)
@@ -57,7 +57,15 @@
 """
 
 from __future__ import print_function
+from functools import reduce
 
+
+try:
+    xrange
+except NameError:
+    xrange = range # Python 3.x
+
+
 __version__ = 1, 5, 0
 
 # SequenceMatcher tries to compute a "human-friendly diff" between

Modified: zope.tal/trunk/src/zope/tal/talgenerator.py
===================================================================
--- zope.tal/trunk/src/zope/tal/talgenerator.py	2013-02-07 20:35:53 UTC (rev 129181)
+++ zope.tal/trunk/src/zope/tal/talgenerator.py	2013-02-07 20:35:56 UTC (rev 129182)
@@ -22,7 +22,12 @@
 from zope.tal.taldefs import parseSubstitution
 from zope.tal.translationcontext import TranslationContext, DEFAULT_DOMAIN
 
+try:
+    xrange
+except NameError:
+    xrange = range # Python 3.x
 
+
 _name_rx = re.compile(NAME_RE)
 
 class TALGenerator(object):

Modified: zope.tal/trunk/src/zope/tal/talinterpreter.py
===================================================================
--- zope.tal/trunk/src/zope/tal/talinterpreter.py	2013-02-07 20:35:53 UTC (rev 129181)
+++ zope.tal/trunk/src/zope/tal/talinterpreter.py	2013-02-07 20:35:56 UTC (rev 129182)
@@ -25,7 +25,12 @@
 from zope.tal.talgenerator import TALGenerator
 from zope.tal.translationcontext import TranslationContext
 
+try:
+    unicode
+except NameError:
+    unicode = str # Python 3.x
 
+
 # Avoid constructing this tuple over and over
 I18nMessageTypes = (Message,)
 

Modified: zope.tal/trunk/src/zope/tal/xmlparser.py
===================================================================
--- zope.tal/trunk/src/zope/tal/xmlparser.py	2013-02-07 20:35:53 UTC (rev 129181)
+++ zope.tal/trunk/src/zope/tal/xmlparser.py	2013-02-07 20:35:56 UTC (rev 129182)
@@ -25,6 +25,12 @@
     from urllib.request import urlopen
 
 
+try:
+    unicode
+except NameError:
+    unicode = str # Python 3.x
+
+
 class XMLParser(object):
 
     ordered_attributes = 0



More information about the checkins mailing list