Merge pull request #17522 from QuLogic/private-ttconv

timhoffm · web-flow · commit 71a6674d2194 · 2020-05-28T21:51:49.000+02:00
Privatize ttconv module.
diff --git a/doc/api/api_changes_3.3/deprecations.rst b/doc/api/api_changes_3.3/deprecations.rst
@@ -589,3 +589,7 @@ implementers).
 Passing ``ismath="TeX!"`` to `.RendererAgg.get_text_width_height_descent` is
 deprecated.  Pass ``ismath="TeX"`` instead, consistently with other low-level
 APIs which support the values True, False, and "TeX" for ``ismath``.
+
+``matplotlib.ttconv``
+~~~~~~~~~~~~~~~~~~~~~
+This module is deprecated.
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -41,7 +41,7 @@
 from matplotlib.path import Path
 from matplotlib.dates import UTC
 from matplotlib import _path
-from matplotlib import ttconv
+from matplotlib import _ttconv
 from . import _backend_pdf_ps
 
 _log = logging.getLogger(__name__)
@@ -996,7 +996,7 @@ def get_char_width(charcode):
             # Make the charprocs array (using ttconv to generate the
             # actual outlines)
             try:
-                rawcharprocs = ttconv.get_pdf_charprocs(
+                rawcharprocs = _ttconv.get_pdf_charprocs(
                     os.fsencode(filename), glyph_ids)
             except RuntimeError:
                 _log.warning("The PDF backend does not currently support the "
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -26,7 +26,7 @@
 from matplotlib.cbook import is_writable_file_like, file_requires_unicode
 from matplotlib.font_manager import is_opentype_cff_font, get_font
 from matplotlib.ft2font import LOAD_NO_HINTING
-from matplotlib.ttconv import convert_ttf_to_ps
+from matplotlib._ttconv import convert_ttf_to_ps
 from matplotlib.mathtext import MathTextParser
 from matplotlib._mathtext_data import uni2type1
 from matplotlib.path import Path
diff --git a/lib/matplotlib/ttconv.py b/lib/matplotlib/ttconv.py
@@ -0,0 +1,9 @@
+"""
+Converting and subsetting TrueType fonts to PS types 3 and 42, and PDF type 3.
+"""
+
+from . import cbook
+from ._ttconv import convert_ttf_to_ps, get_pdf_charprocs  # noqa
+
+
+cbook.warn_deprecated('3.3', name=__name__, obj_type='module')
diff --git a/setupext.py b/setupext.py
@@ -413,7 +413,7 @@ def get_extensions(self):
         yield ext
         # ttconv
         ext = Extension(
-            "matplotlib.ttconv", [
+            "matplotlib._ttconv", [
                 "src/_ttconv.cpp",
                 "extern/ttconv/pprdrv_tt.cpp",
                 "extern/ttconv/pprdrv_tt2.cpp",
diff --git a/src/_ttconv.cpp b/src/_ttconv.cpp
@@ -279,7 +279,7 @@ static PyModuleDef ttconv_module = {
 #pragma GCC visibility push(default)
 
 PyMODINIT_FUNC
-PyInit_ttconv(void)
+PyInit__ttconv(void)
 {
     PyObject* m;
 

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ static PyModuleDef ttconv_module = {`
`279`	`279`	`#pragma GCC visibility push(default)`
`280`	`280`
`281`	`281`	`PyMODINIT_FUNC`
`282`		`-PyInit_ttconv(void)`
	`282`	`+PyInit__ttconv(void)`
`283`	`283`	`{`
`284`	`284`	`PyObject* m;`
`285`	`285`