Fix problem with cgi.escape being depricated a different way. This way

uses anypy and is cleaner. Also fixes incorrect/incomplete change that
resulted in escaped in TAL generated by TALInterpreter.py. The escaped
quotes break javascript etc. defined using tal string: values.

TODO: add test cases for TAL. This wouldn't have snuck through for a
month if we had good coverage of that library.

Author: rouilj

roundup/anypy/html.py

@@ -0,0 +1,8 @@
+try:
+    from html import escape as html_escape_ # python 3
+    def html_escape(str, quote=False):
+        # html_escape under python 3 sets quote to true by default
+        # make it python 2 compatible
+        return html_escape_(str, quote=quote)
+except ImportError:
+    from cgi import escape as html_escape # python 2 fallback

roundup/backends/sessions_dbm.py

@@ -8,10 +8,7 @@
 
 import os, marshal, time
 
-try:
-    from html import escape
-except ImportError:
-    from cgi import escape
+from roundup.anypy.html import html_escape as escape
 
 from roundup import hyperdb
 from roundup.i18n import _

roundup/backends/sessions_rdbms.py

@@ -7,10 +7,7 @@
 __docformat__ = 'restructuredtext'
 import os, time, logging
 
-try:
-    from html import escape
-except ImportError:
-    from cgi import escape
+from roundup.anypy.html import html_escape as escape
 
 class BasicDatabase:
     ''' Provide a nice encapsulation of an RDBMS table.

roundup/cgi/PageTemplates/TALES.py

@@ -283,8 +283,8 @@ def getInfo(self, as_html=0):
         if not as_html:
             return '   - Names:\n      %s' % s.replace('\n', '\n      ')
         else:
-            from cgi import escape
-            return '<b>Names:</b><pre>%s</pre>' % (escape(s))
+            from roundup.anypy.html import html_escape
+            return '<b>Names:</b><pre>%s</pre>' % (html_escape(s))
 
 
 class SimpleExpr:

roundup/cgi/TAL/TALGenerator.py

@@ -25,10 +25,7 @@
 from .TALDefs import parseSubstitution
 from .TranslationContext import TranslationContext, DEFAULT_DOMAIN
 
-try:
-    from html import escape as html_escape  # python 3
-except ImportError:
-    from cgi import escape as html_escape   # python 2 fallback
+from roundup.anypy.html import html_escape
 
 I18N_REPLACE = 1
 I18N_CONTENT = 2

roundup/cgi/TAL/TALInterpreter.py

@@ -21,11 +21,8 @@
 import getopt
 import re
 
-try:
-    from html import escape
-except ImportError:
-    from cgi import escape
 
+from roundup.anypy.html import html_escape as escape
 from roundup.anypy.strings import StringIO
 #from DocumentTemplate.DT_Util import ustr
 ustr = str

roundup/cgi/actions.py

@@ -11,10 +11,7 @@
 from roundup.anypy.strings import StringIO
 import roundup.anypy.random_ as random_
 
-try:
-    from html import escape as html_escape  # python 3
-except ImportError:
-    from cgi import escape as html_escape   # python 2 fallback
+from roundup.anypy.html import html_escape
 
 import time
 from datetime import timedelta

roundup/cgi/cgitb.py

@@ -10,10 +10,7 @@
 import sys, os, keyword, linecache, tokenize, inspect, cgi
 import pydoc, traceback
 
-try:
-    from html import escape as html_escape  # python 3
-except ImportError:
-    from cgi import escape as html_escape   # python 2 fallback
+from roundup.anypy.html import html_escape
 
 from roundup.cgi import templating, TranslationService
 from roundup.anypy.strings import s2b

roundup/cgi/client.py

@@ -23,10 +23,7 @@
     class SysCallError(Exception):
         pass
 
-try:
-    from html import escape as html_escape  # python 3
-except ImportError:
-    from cgi import escape as html_escape   # python 2 fallback
+from roundup.anypy.html import html_escape
 
 from roundup import roundupdb, date, hyperdb, password
 from roundup.cgi import templating, cgitb, TranslationService

roundup/cgi/exceptions.py

@@ -5,10 +5,7 @@
 
 from roundup.exceptions import LoginError, Unauthorised
 
-try:
-    from html import escape as html_escape  # python 3
-except ImportError:
-    from cgi import escape as html_escape   # python 2 fallback
+from roundup.anypy.html import html_escape
 
 class HTTPException(BaseException):
     pass