More cgi.escape/html.escape fixes.

Author: rouilj

roundup/backends/sessions_dbm.py

@@ -8,7 +8,11 @@
 
 import os, marshal, time
 
-from cgi import escape
+try:
+    from html import escape
+except ImportError:
+    from cgi import escape
+
 from roundup import hyperdb
 from roundup.i18n import _
 from roundup.anypy.dbm_ import anydbm, whichdb

roundup/backends/sessions_rdbms.py

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