Suppress deprecation warnings on Py3k.

zopefoundation · Dec 29, 2014 · fbf75a7 · fbf75a7
1 parent 23ef7a7
commit fbf75a7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/zope/structuredtext/html.py b/src/zope/structuredtext/html.py
@@ -13,7 +13,13 @@
 """ HTML renderer for STX documents.
 """
 
-from cgi import escape
+try:
+    from html import escape
+except ImportError:  # pragma: NO COVER Python2
+    from cgi import escape
+else:                # pragma: NO COVER Py3k
+    from functools import partial
+    escape = partial(escape, quote=False)
 
 __metaclass__ = type
 

diff --git a/src/zope/structuredtext/tests.py b/src/zope/structuredtext/tests.py
@@ -46,7 +46,7 @@ def testDocumentClass(self):
             doc = Document()
             raw_text = readFile(regressions, f)
             text = stng.structurize(raw_text)
-            self.assert_(doc(text))
+            self.assertTrue(doc(text))
 
     def testRegressionsTests(self):
         # HTML regression test