u() wrapper no longer needed

blockdiag · Dec 8, 2019 · 3eb3e0f · 3eb3e0f
1 parent 391ee40
commit 3eb3e0f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/sphinxcontrib/blockdiag.py b/sphinxcontrib/blockdiag.py
@@ -26,7 +26,7 @@
 import blockdiag.utils.rst.nodes
 import blockdiag.utils.rst.directives
 from blockdiag.utils.bootstrap import detectfont, Application
-from blockdiag.utils.compat import u, string_types
+from blockdiag.utils.compat import string_types
 from blockdiag.utils.fontmap import FontMap
 from blockdiag.utils.rst.directives import with_blockdiag
 
@@ -85,7 +85,7 @@ def resolve_reference(builder, href):
     if href is None:
         return None
 
-    pattern = re.compile(u("^:ref:`(.+?)`"), re.UNICODE)
+    pattern = re.compile("^:ref:`(.+?)`", re.UNICODE)
     matched = pattern.search(href)
     if matched is None:
         return href

diff --git a/tests/test_errors.py b/tests/test_errors.py
@@ -2,7 +2,6 @@
 
 from mock import patch
 from sphinx_testing import with_app
-from blockdiag.utils.compat import u
 
 import sys
 import unittest
@@ -49,7 +48,7 @@ def test_rendering_error(self, app, status, warning, DiagramDraw):
     @with_app(srcdir='tests/docs/basic')
     @patch("sphinxcontrib.blockdiag.blockdiag.drawer.DiagramDraw.draw")
     def test_font_settings_error(self, app, status, warning, draw):
-        draw.side_effect = UnicodeEncodeError("", u(""), 0, 0, "")
+        draw.side_effect = UnicodeEncodeError("", "", 0, 0, "")
         app.builder.build_all()
         self.assertIn('UnicodeEncodeError caught (check your font settings)',
                       warning.getvalue())
diff --git a/tests/test_latex.py b/tests/test_latex.py
@@ -3,7 +3,6 @@
 import os
 import re
 from sphinx_testing import with_app
-from blockdiag.utils.compat import u
 
 import unittest
 
@@ -14,21 +13,21 @@
                         buildername='latex',
                         write_docstring=True,
                         confoverrides={
-                            'latex_documents': [('index', 'test.tex', u(''), u('test'), 'manual')],
+                            'latex_documents': [('index', 'test.tex', '', 'test', 'manual')],
                         })
 with_pdf_app = with_app(srcdir='tests/docs/basic',
                         buildername='latex',
                         write_docstring=True,
                         confoverrides={
-                            'latex_documents': [('index', 'test.tex', u(''), u('test'), 'manual')],
+                            'latex_documents': [('index', 'test.tex', '', 'test', 'manual')],
                             'blockdiag_latex_image_format': 'PDF',
                             'blockdiag_fontpath': blockdiag_fontpath,
                         })
 with_oldpdf_app = with_app(srcdir='tests/docs/basic',
                            buildername='latex',
                            write_docstring=True,
                            confoverrides={
-                               'latex_documents': [('index', 'test.tex', u(''), u('test'), 'manual')],
+                               'latex_documents': [('index', 'test.tex', '', 'test', 'manual')],
                                'blockdiag_tex_image_format': 'PDF',
                                'blockdiag_fontpath': blockdiag_fontpath,
                            })