TTFQuery 2.0.1a1__tar.gz → 2.1.0__tar.gz

{ttfquery-2.0.1a1 → ttfquery-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TTFQuery
-Version: 2.0.1a1
+Version: 2.1.0
 Summary: FontTools-based package for querying system fonts
 Home-page: http://ttfquery.sourceforge.net/
 Author: Mike C. Fletcher
@@ -46,12 +46,18 @@ License: THIS SOFTWARE IS NOT FAULT TOLERANT AND SHOULD NOT BE USED IN ANY
 Project-URL: Homepage, http://ttfquery.sourceforge.net/
 Keywords: fonttools,ttf,truetype,outline,font,curve,system fonts
 Platform: Any
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Multimedia :: Graphics
-Requires-Python: >=3.7
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 Requires-Dist: fonttools
 Requires-Dist: numpy

{ttfquery-2.0.1a1 → ttfquery-2.1.0}/TTFQuery.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TTFQuery
-Version: 2.0.1a1
+Version: 2.1.0
 Summary: FontTools-based package for querying system fonts
 Home-page: http://ttfquery.sourceforge.net/
 Author: Mike C. Fletcher
@@ -46,12 +46,18 @@ License: THIS SOFTWARE IS NOT FAULT TOLERANT AND SHOULD NOT BE USED IN ANY
 Project-URL: Homepage, http://ttfquery.sourceforge.net/
 Keywords: fonttools,ttf,truetype,outline,font,curve,system fonts
 Platform: Any
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Multimedia :: Graphics
-Requires-Python: >=3.7
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 Requires-Dist: fonttools
 Requires-Dist: numpy

ttfquery-2.1.0/pyproject.toml

@@ -0,0 +1,102 @@
+[build-system]
+requires = ["setuptools>=61.0"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "TTFQuery"
+dynamic = ["version"]
+description = "FontTools-based package for querying system fonts"
+readme = "README.md"
+license = { file = "license.txt" }
+authors = [
+    { name = "Mike C. Fletcher", email = "mcfletch@users.sourceforge.net" },
+]
+requires-python = ">=3.9"
+dependencies = [
+    "fonttools",
+    "numpy",
+]
+keywords = [
+    "fonttools",
+    "ttf",
+    "truetype",
+    "outline",
+    "font",
+    "curve",
+    "system fonts",
+]
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+    "Intended Audience :: Developers",
+    "Operating System :: OS Independent",
+    "Topic :: Multimedia :: Graphics",
+]
+
+[project.urls]
+Homepage = "http://ttfquery.sourceforge.net/"
+
+[project.optional-dependencies]
+test = [
+    "pytest",
+    "pytest-cov",
+]
+
+[project.scripts]
+ttffiles = "ttfquery.ttffiles:main"
+ttffamily = "ttfquery.ttffamily:main"
+ttfgroups = "ttfquery.ttfgroups:main"
+ttfmetadata = "ttfquery.ttfmetadata:main"
+
+[tool.setuptools]
+packages = ["ttfquery"]
+
+[tool.setuptools.dynamic]
+version = { attr = "ttfquery.__version__" }
+
+# uv decides whether its cached metadata for a source tree is still current
+# from pyproject.toml, setup.py and setup.cfg alone. This project's version
+# lives in ttfquery/__init__.py, so name that file too: without it a version
+# bump leaves uv answering with the previous number, and a dependent requiring
+# the new one resolves against PyPI rather than this checkout.
+[tool.uv]
+cache-keys = [{ file = "pyproject.toml" }, { file = "ttfquery/__init__.py" }]
+
+# Named explicitly rather than left to ruff's default, which has widened
+# between releases: a gate whose meaning moves when a tool is upgraded is not a
+# gate. `E,W,F,B` is what the other pre-2010 projects here hold to.
+[tool.ruff.lint]
+select = ["E", "W", "F", "B"]
+# `_name` as well as `_`: an underscore prefix is how Python says a name is
+# bound but deliberately unused.
+dummy-variable-rgx = "^(_[a-zA-Z0-9_]*|err)$"
+ignore = [
+    'E501', # long lines, kept readable by hand
+]
+
+# The package's own declarations, checked as a consumer's checker reads them.
+# `check_untyped_defs` rather than `disallow_untyped_defs`: this package is
+# older than annotations, and its bodies being checked is the half that finds
+# defects -- the other half is a job of its own, tracked as one.
+[tool.mypy]
+# Named here so that `mypy` with no arguments checks the package: the tox
+# environment and a developer's bare `mypy` are then the same run.
+files = ["ttfquery"]
+python_version = "3.12"
+check_untyped_defs = true
+warn_unused_ignores = true
+ignore_missing_imports = true
+
+# `findsystem` reads the Windows font directories out of the registry, and
+# `winreg` is a module Linux does not have. Checked as Windows sees it in a
+# second run -- see tools/preflight.toml -- so this keeps the Linux run from
+# reporting nine absent names as defects.
+[[tool.mypy.overrides]]
+module = "ttfquery.findsystem"
+disable_error_code = ["attr-defined"]

{ttfquery-2.0.1a1 → ttfquery-2.1.0}/setup.py

@@ -5,7 +5,7 @@ Run:
     python setup.py install
 to install the package from the source archive.
 """
-import sys, os, string
+import os
 from setuptools import setup
 HERE = os.path.dirname(__file__)
 
@@ -32,9 +32,9 @@ if __name__ == "__main__":
             'ttfquery':'ttfquery',
         },
         packages = [
-            'ttfquery', 
+            'ttfquery',
         ],
-	install_requires = ['fonttools','numpy'],
+    install_requires = ['fonttools','numpy'],
         classifiers= [
             """Programming Language :: Python""",
             """Topic :: Software Development :: Libraries :: Python Modules""",
@@ -74,4 +74,4 @@ which TTFQuery was refactored.
             ]
         }
     )
-    
+

ttfquery-2.1.0/tests/test_describe.py

@@ -0,0 +1,56 @@
+from __future__ import print_function
+from ttfquery import describe, findsystem
+import unittest
+
+class TestDescribe(unittest.TestCase):
+    def test_describe_system_fonts(self):
+        for fontfile in list(findsystem.findFonts())[:100]:
+            try:
+                font = describe.openFont(fontfile)
+            except Exception as err:
+                err.args += ('Error opening font', font)
+                raise
+            else:
+                short = describe.shortName( font )
+                assert short, "Null name for font %s"%(fontfile,)
+                family = describe.family( font )
+                assert len(family)==2, family
+                modifiers = describe.modifiers( font )
+                assert describe.weightName(modifiers[0])
+
+
+class TestTheNameIsText:
+    """`shortName` answers what the font calls itself, as text.
+
+    A name record is bytes in one of two encodings, and answering those bytes
+    put `b'Open Sans'` into every message that named a font and left the font
+    registry decoding what this had just encoded.
+    """
+
+    def a_font(self):
+        from ttfquery import findsystem
+        for path in findsystem.findFonts():
+            try:
+                return describe.openFont(path)
+            except Exception:
+                continue
+        return None
+
+    def test_both_halves_are_strings(self):
+        font = self.a_font()
+        if font is None:
+            import pytest
+            pytest.skip('no readable font on this machine')
+        name, family = describe.shortName(font)
+        assert isinstance(name, str), repr(name)
+        assert isinstance(family, str), repr(family)
+
+    def test_a_two_byte_record_is_read_as_utf_16(self):
+        assert describe._recordText('Ångstrom'.encode('utf-16-be')) == \
+            'Ångstrom'
+
+    def test_a_single_byte_record_is_read_as_latin_1(self):
+        assert describe._recordText(b'Open Sans') == 'Open Sans'
+
+    def test_text_is_left_as_it_is(self):
+        assert describe._recordText('Open Sans') == 'Open Sans'

{ttfquery-2.0.1a1 → ttfquery-2.1.0}/tests/test_findsystem_linux.py

@@ -1,9 +1,10 @@
 from __future__ import print_function
 from ttfquery import findsystem
 import pytest
-import sys, glob, unittest
+import sys
+import unittest
 pytestmark = pytest.mark.skipif(
-    not sys.platform.startswith('linux'), 
+    not sys.platform.startswith('linux'),
     reason='Linux tests'
 )
 
@@ -15,4 +16,3 @@ class TestLinux(unittest.TestCase):
     def test_fonts_from_registry(self):
         fonts = findsystem.findFonts()
         assert fonts, "No fonts were found in our default font-search paths"
-    

{ttfquery-2.0.1a1 → ttfquery-2.1.0}/tests/test_findsystem_win32.py

@@ -1,7 +1,10 @@
 from __future__ import print_function
 from ttfquery import findsystem
 import pytest
-import sys, glob, unittest
+import os
+import sys
+import glob
+import unittest
 pytestmark = pytest.mark.skipif(not sys.platform == 'win32', reason='Win32 tests')
 
 class TestWin32(unittest.TestCase):

{ttfquery-2.0.1a1 → ttfquery-2.1.0}/tests/test_glyphquery.py

@@ -1,7 +1,9 @@
 from __future__ import print_function
 from ttfquery import ttffiles, describe, glyphquery, glyph
-import pytest
-import os, sys, glob, unittest, tempfile, shutil
+import os
+import unittest
+import tempfile
+import shutil
 
 class TestGlyphQuery(unittest.TestCase):
     def setUp(self):
@@ -17,15 +19,15 @@ class TestGlyphQuery(unittest.TestCase):
 
     def test_has_a_glyph(self):
         has,total = 0,0
-        for name,metadata in self.registry.specificFonts.items():
+        for _name,metadata in self.registry.specificFonts.items():
             font = describe.openFont(metadata.file_name)
-            height = glyphquery.charHeight(font)
-            line = glyphquery.lineHeight(font)
-            desc = glyphquery.charDescent(font)
+            glyphquery.charHeight(font)
+            glyphquery.lineHeight(font)
+            glyphquery.charDescent(font)
             if glyphquery.hasGlyph(font,'a'):
                 glyphName = glyphquery.explicitGlyph(font,'a')
                 if glyphName:
-                    width = glyphquery.width(font,glyphName)
+                    glyphquery.width(font,glyphName)
                     has += 1
 
                     shape = glyph.Glyph(glyphName)
@@ -38,7 +40,7 @@ class TestGlyphQuery(unittest.TestCase):
             else:
                 glyphName = glyphquery.glyphName(font,'a')
                 assert glyphName, """Didn't get a placeholder for the 'a' character"""
-                width = glyphquery.width(font,glyphName)
+                glyphquery.width(font,glyphName)
             total += 1
         assert total, "No specific fonts on this system?"
         assert has/float(total) > .2, "More than 4/5 of fonts on this system are missing a glyph for `a`? %s/%s"%(has,total)

{ttfquery-2.0.1a1 → ttfquery-2.1.0}/tests/test_registry.py

@@ -1,7 +1,9 @@
 from __future__ import print_function
 from ttfquery import ttffiles, ttfgroups, ttfmetadata, ttffamily
-import pytest
-import os, sys, glob, unittest, tempfile, shutil
+import os
+import unittest
+import tempfile
+import shutil
 
 class TestRegistry(unittest.TestCase):
     def setUp(self):
@@ -30,10 +32,10 @@ class TestRegistry(unittest.TestCase):
             except KeyError:
                 pass
             if font:
-                break 
+                break
         if not font:
             raise RuntimeError("Unable to find any of Arial/Helvetica/SANS")
-        
+
     def test_ttfgroups(self):
         registry = self.registry
         table = ttfgroups.buildTable(registry)
@@ -56,4 +58,3 @@ class TestRegistry(unittest.TestCase):
             ttffamily.search(registry,family)
             for subfam in subfams.keys():
                 ttffamily.search(registry,family,subfam)
-        

{ttfquery-2.0.1a1 → ttfquery-2.1.0}/ttfquery/__init__.py

@@ -1,2 +1,2 @@
 """Fonttools package for querying and sorting system fonts"""
-__version__ = "2.0.1a1"
+__version__ = "2.1.0"

{ttfquery-2.0.1a1 → ttfquery-2.1.0}/ttfquery/_scriptregistry.py

@@ -1,7 +1,7 @@
 """The singleton "registry" object (an instance of :class:`ttfquery.ttffiles.Registry`
-is the only member of note).  This registry with be created in a file 
-in the user's $HOME directory ``.font.cache`` if the $HOME environment variable 
-is defined.  Otherwise will be created in the ttfquery source code directory 
+is the only member of note).  This registry with be created in a file
+in the user's $HOME directory ``.font.cache`` if the $HOME environment variable
+is defined.  Otherwise will be created in the ttfquery source code directory
 (which is obviously not a very good solution).
 
 .. note::

{ttfquery-2.0.1a1 → ttfquery-2.1.0}/ttfquery/describe.py

@@ -1,16 +1,13 @@
 """Extract meta-data from a font-file to describe the font"""
-from fontTools import ttLib
+import logging
 import sys
+from typing import Dict, List
+
+from fontTools import ttLib
 
-try:
-    unicode, long
-except NameError:
-    unicode = str
-    long = int
-try:
-    from OpenGLContext.debug.logs import text_log
-except ImportError:
-    text_log = None
+unicode = str
+long = int
+log = logging.getLogger(__name__)
 
 
 def openFont(filename):
@@ -24,21 +21,33 @@ FONT_SPECIFIER_NAME_ID = 4
 FONT_SPECIFIER_FAMILY_ID = 1
 
 
+def _recordText(value):
+    """A name record as text, whichever way the font stored it.
+
+    A record is bytes in one of two encodings and the font does not say which:
+    UTF-16BE where it carries the NUL bytes of one, and a single-byte encoding
+    otherwise -- Latin-1, which is what the Macintosh Roman a name table names
+    agrees with for the characters a font name uses.
+    """
+    if not isinstance(value, bytes):
+        return value
+    return (value.decode("utf-16-be") if b"\000" in value
+            else value.decode("latin-1"))
+
+
 def shortName(font):
-    """Get the short name from the font's names table"""
+    """The font's own name and its family's, as text
+
+    ``('Open Sans Bold Italic', 'Open Sans')`` -- what the font calls itself,
+    and the family it belongs to.
+    """
     name = ""
     family = ""
     for record in font["name"].names:
         if record.nameID == FONT_SPECIFIER_NAME_ID and not name:
-            if b"\000" in record.string:
-                name = unicode(record.string, "utf-16-be").encode("utf-8")
-            else:
-                name = record.string
+            name = _recordText(record.string)
         elif record.nameID == FONT_SPECIFIER_FAMILY_ID and not family:
-            if b"\000" in record.string:
-                family = unicode(record.string, "utf-16-be").encode("utf-8")
-            else:
-                family = record.string
+            family = _recordText(record.string)
         if name and family:
             break
     return name, family
@@ -183,7 +192,9 @@ WEIGHT_NAMES = {
     "black": 900,
     "heavy": 900,
 }
-WEIGHT_NUMBERS = {}
+#: Every name for each weight, so a number reads back as the words a font
+#: might have used for it.
+WEIGHT_NUMBERS: Dict[int, List[str]] = {}
 for key, value in WEIGHT_NAMES.items():
     WEIGHT_NUMBERS.setdefault(value, []).append(key)
 
@@ -231,8 +242,7 @@ def familyNames(familyID, subFamilyID=0):
     """Convert family integers to human-readable names"""
     familyName, subFamilies = FAMILY_NAMES.get(familyID, ("RESERVED", None))
     if familyName == "RESERVED":
-        if text_log:
-            text_log.warn("Font has invalid (reserved) familyID: %s", familyID)
+        log.warning("Font has invalid (reserved) familyID: %s", familyID)
     if subFamilies:
         subFamily = subFamilies.get(subFamilyID, "RESERVED")
     else:
@@ -279,11 +289,7 @@ def guessEncoding(font, given=None):
     """
     if isinstance(given, tuple) and given:
         if len(given) == 2:
-            if __debug__:
-                if text_log:
-                    text_log.info(
-                        """Checking for explicitly required encoding %r""", given
-                    )
+            log.debug("Checking for explicitly required encoding %r", given)
             if not font["cmap"].getcmap(*given):
                 raise ValueError(
                     """The specified font encoding %r does not appear to be available within the font %r. Available encodings: %s"""

{ttfquery-2.0.1a1 → ttfquery-2.1.0}/ttfquery/findsystem.py

@@ -1,36 +1,37 @@
 """Find system fonts (only works on Linux and Win32 at the moment)"""
 from __future__ import print_function
-try:
-    unicode
-except NameError:
-    unicode = str
-import sys, os, glob, re
+import sys
+import os
+import glob
+import re
+
+unicode = str
 
 def win32FontDirectory( ):
     """Get User-specific font directory on Win32"""
     try:
-        import _winreg
+        import winreg
     except ImportError:
         return os.path.join(os.environ['WINDIR'], 'Fonts')
     else:
-        k = _winreg.OpenKey(
-            _winreg.HKEY_CURRENT_USER,
+        k = winreg.OpenKey(
+            winreg.HKEY_CURRENT_USER,
             r"Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders"
         )
         try:
             # should check that k is valid? How?
-            return _winreg.QueryValueEx( k, "Fonts" )[0]
+            return winreg.QueryValueEx( k, "Fonts" )[0]
         finally:
-            _winreg.CloseKey( k )
+            winreg.CloseKey( k )
 
 def win32InstalledFonts( fontDirectory = None ):
     """Get list of explicitly *installed* font names
-    
+
     IFF there is no registry entry for installed fonts,
     likely due to a too-new windows install, then we'll
     just return all .ttf files in fontDirectory
     """
-    import _winreg
+    import winreg
     if fontDirectory is None:
         fontDirectory = win32FontDirectory()
     k = None
@@ -40,32 +41,34 @@ def win32InstalledFonts( fontDirectory = None ):
         r"SOFTWARE\Microsoft\Windows\CurrentVersion\Fonts",
     ):
         try:
-            k = _winreg.OpenKey(
-                _winreg.HKEY_LOCAL_MACHINE,
+            k = winreg.OpenKey(
+                winreg.HKEY_LOCAL_MACHINE,
                 keyName
             )
         except OSError as err:
             pass
+        else:
+            break
     if not k:
         # couldn't open either WinNT or Win98 key???
         return glob.glob( os.path.join(fontDirectory, '*.ttf'))
     try:
         # should check that k is valid? How?
-        for index in range( _winreg.QueryInfoKey(k)[1]):
-            key,value,_ = _winreg.EnumValue( k, index )
+        for index in range( winreg.QueryInfoKey(k)[1]):
+            key,value,_ = winreg.EnumValue( k, index )
             if not os.path.dirname( value ):
                 value = os.path.join( fontDirectory, value )
             value = os.path.abspath( value ).lower()
             if value[-4:] == '.ttf':
                 items[ value ] = 1
-        return items.keys()
+        return list(items.keys())
     finally:
-        _winreg.CloseKey( k )
-    
+        winreg.CloseKey( k )
+
 
 def linuxFontDirectories( ):
     """Get system font directories on Linux/Unix
-    
+
     Uses /usr/sbin/chkfontpath to get the list
     of system-font directories, note that many
     of these will *not* be truetype font directories.
@@ -101,7 +104,7 @@ def linuxFontDirectories( ):
             "/System/Library/Fonts/",
             "System Folder:Fonts:",
         ]
-        
+
         set = []
         for directory in directories:
             directory = directory = os.path.expanduser( os.path.expandvars(directory))

{ttfquery-2.0.1a1 → ttfquery-2.1.0}/ttfquery/glyph.py

@@ -21,7 +21,7 @@ class Glyph( object):
         ]
         self.width = glyphquery.width( font, self.glyphName )
         self.height = glyphquery.lineHeight( font )
-    
+
     def calculateContours( self, font ):
         """Given a character, determine contours to draw
 
@@ -85,7 +85,7 @@ class Glyph( object):
                     list(flags[last:])+list(flags[last:])
                 ) ))
         return contours
-        
+
 def decomposeOutline( contour, steps=3 ):
     """Decompose a single TrueType contour to a line-loop
 
@@ -118,14 +118,14 @@ def decomposeOutline( contour, steps=3 ):
     set = contour[:]
     def on( record ):
         """Is this record on the contour?
-        
+
         record = ((Ax,Ay),Af)
         """
         return record[-1] == 1
 
     def merge( first, second):
         """Merge two off-point records into an on-point record"""
-        ((Ax,Ay),Af) = first 
+        ((Ax,Ay),Af) = first
         ((Bx,By),Bf) = second
         return (((Ax+Bx)/2.0),((Ay+By))/2.0),1
     # create an expanded set so that all adjacent
@@ -152,7 +152,7 @@ def decomposeOutline( contour, steps=3 ):
                 if len(expanded) == 2:                          #KH
                     assert on(expanded[0]), """Expanded outline finishes off-curve""" #KH
                     result.append( expanded[1][0] )         #KH
-                    del expanded[:1] 
+                    del expanded[:1]
                     break
                 assert on(expanded[2]), "Expanded outline doesn't have proper format!"
                 points = integrateQuadratic( expanded[:3], steps = steps )

{ttfquery-2.0.1a1 → ttfquery-2.1.0}/ttfquery/glyphquery.py

@@ -1,9 +1,9 @@
 """Glyph-specific queries on font-files"""
+import logging
+
 from ttfquery import describe
-try:
-    from OpenGLContext.debug.logs import text_log
-except ImportError:
-    text_log = None
+
+log = logging.getLogger(__name__)
 
 def hasGlyph( font, char, encoding=None ):
     """Check to see if font appears to have explicit glyph for char"""
@@ -35,8 +35,8 @@ def glyphName( font, char, encoding=None, warnOnFailure=1 ):
         glyfName = table.cmap.get( -1)
         if glyfName is None:
             glyfName = font['glyf'].glyphOrder[0]
-            if text_log and warnOnFailure:
-                text_log.warn(
+            if warnOnFailure:
+                log.warning(
                     """Unable to find glyph name for %r, in %r using first glyph in table (%r)""",
                     char,
                     describe.shortName(font),
@@ -54,10 +54,10 @@ def width( font, glyphName ):
     """
     try:
         return font['hmtx'].metrics[ glyphName ][0]
-    except KeyError:
+    except KeyError as err:
         raise ValueError( """Couldn't find glyph for glyphName %r"""%(
             glyphName,
-        ))
+        )) from err
 
 def lineHeight( font ):
     """Get the base-line to base-line height for the font

{ttfquery-2.0.1a1 → ttfquery-2.1.0}/ttfquery/guessdescription.py

@@ -16,6 +16,7 @@ XXX This is English-specific and entirely dependent on the
     there will be a considerable number of cases where the
     resulting name and flags will be incorrect.
 """
+from typing import Any, Dict
 WEIGHTS = [
     'demibold', 'extrabold', 'semibold', 'ultrabold', 'bold',
     'ultralight', 'extralight', 'light',
@@ -48,12 +49,13 @@ WEIGHT_SYNONYMS = [
 WEIGHT_MODIFIERS = [
     'extra', 'ultra'
 ]
-    
+
 
 ITALIC_INDICATORS = [
     'italic', 'ital','itali', 'it', 'bolditalic',
 ]
-SYSTEM_FONTS = {}
+#: The fonts a scan of the system found, by the name it was asked for.
+SYSTEM_FONTS: Dict[str, Any] = {}
 
 def interpretModifiers( name ):
     """Heuristic attempt to get weight and italic data from font-name
@@ -130,6 +132,6 @@ def get( name, style=None ):
             if key[0] == style[0]:
                 return value
         # well, there's at least one font here, use it...
-        for key, value in set.items():
+        for _key, value in set.items():
             return value
     return None

{ttfquery-2.0.1a1 → ttfquery-2.1.0}/ttfquery/scriptregistry.py

@@ -1,13 +1,14 @@
 """Provides a single font metadata cache from which multiple programs can run
 
-Note: on systems without an XDG_CACHE_HOME or a HOME environment variable 
+Note: on systems without an XDG_CACHE_HOME or a HOME environment variable
 this will store the cache in the *code* directory for ttfquery, which is
 obviously sub-optimal.
 
 `registryFile` -- calculated at load time as the location for the cache
 """
 from ttfquery import ttffiles
-import os, logging 
+import os
+import logging
 log = logging.getLogger( __name__ )
 
 ### more robust registry-file location by John Hunter...

{ttfquery-2.0.1a1 → ttfquery-2.1.0}/ttfquery/ttffamily.py

@@ -2,7 +2,7 @@
 """Query for font-members of a particular family"""
 from __future__ import print_function
 from ttfquery import ttffiles
-import sys, logging
+import logging
 log = logging.getLogger( __name__ )
 
 def get_options():

{ttfquery-2.0.1a1 → ttfquery-2.1.0}/ttfquery/ttffiles.py

@@ -1,18 +1,17 @@
 """Registry of available TrueType font files"""
 from ttfquery import describe, findsystem
-import traceback, os
+import traceback
+import os
 try:
-    import cPickle as pickle 
+    import cPickle as pickle
 except ImportError:
     import pickle
-try:
-    unicode 
-except NameError:
-    unicode = str
-import logging 
-log =logging.getLogger( __name__ )
+import logging
 from collections import namedtuple
 
+unicode = str
+log = logging.getLogger( __name__ )
+
 class FontMetadata(namedtuple(
     'FontMetadata',
     (
@@ -26,10 +25,10 @@ class FontMetadata(namedtuple(
     """Stores specific font metadata
 
     A specific font is basically an actual font-file,
-    that is, it is one of a family of fonts which make 
+    that is, it is one of a family of fonts which make
     up the various "modified" versions of a font face.
 
-    So `Ubuntu Light Italic` would be a specific font 
+    So `Ubuntu Light Italic` would be a specific font
     that is a part of the font-face `Ubuntu` with the modifers
     for `Light` and `Italic` applied.
 
@@ -67,7 +66,7 @@ class Registry(object):
             specific font names
         shortFiles -- mapping from font filename basenames
             to font-file-lists
-        
+
         DIRTY -- flag indicating whether the registry has
             had a new font registered (i.e. whether it should
             be saved out to disk).
@@ -136,7 +135,7 @@ class Registry(object):
         )
         return FontMetadata(*[
             (x.decode('utf-8') if isinstance(x,bytes) else x)
-            for x in result 
+            for x in result
         ])
     def register(
         self,
@@ -160,7 +159,7 @@ class Registry(object):
         if filename in self.files and not force:
             return self.specificFonts.get( self.files[filename] )
         self.dirty(1)
-        if modifiers == None:
+        if modifiers is None:
             (filename, modifiers, specificName, fontName, familySpecifier) = self.metadata(filename, force = force)
         description = FontMetadata(filename, modifiers, specificName, fontName, familySpecifier)
         try:
@@ -181,13 +180,13 @@ class Registry(object):
 
         :param major: string description of major family
         :param minor: optional string description of minor family
-        
+
         :rtype: list of font faces in the family
         """
         major = major.upper()
         if not minor:
             result = []
-            for key,set in self.families.get(major,{}).items():
+            for _key,set in self.families.get(major,{}).items():
                 result.extend( set.keys())
             return result
         minor = minor.upper()
@@ -215,7 +214,7 @@ class Registry(object):
         return result
     def fontForms( self, fontName ):
         """Retrieve the set of font-forms (weight,italics) available in a font
-        
+
         :param fontName: general font name to search
         :rtype: list of two-tuples of (weight,italics) available in the font
         """
@@ -223,7 +222,7 @@ class Registry(object):
 
     def fontFile( self, specificName ):
         """Return the absolute path-name for a given specific font
-        
+
         :param specificName: specific font name to search
         :rtype: str(file_name) of the FontMetadata instance
         """
@@ -235,7 +234,7 @@ class Registry(object):
 
     def matchName( self, name, single=0 ):
         """Try to find a general font based on a name
-        
+
         :param name: name to use to try to find the font, can match on any of
             specific name, major family, or minor family
         :param single: return the first match only (not a dictionary of results)
@@ -381,10 +380,10 @@ def get_options():
 
 
 def main():
-    import logging 
+    import logging
     logging.basicConfig(level=logging.INFO)
     options = get_options().parse_args()
-    registry = registry_for_options(options)
+    registry_for_options(options)
     return 0
 
 def registry_for_options(options):
@@ -395,14 +394,14 @@ def registry_for_options(options):
     else:
         registry = Registry()
         new = True
-    scan = new 
+    scan = new
     if getattr(options,'scan',False):
         log.info("Forcing rescan of directories")
         scan = True
     if scan:
-        new,failed = registry.scan( 
-            options.directories or None, 
-            printErrors = False, 
+        new,failed = registry.scan(
+            options.directories or None,
+            printErrors = False,
             force = 1
         )
         if options.registry and registry.DIRTY:

{ttfquery-2.0.1a1 → ttfquery-2.1.0}/ttfquery/ttfgroups.py

@@ -1,7 +1,9 @@
 """Demo script to print ordered set of system fonts"""
 from __future__ import print_function
-from ttfquery import describe, ttffiles
-import sys, logging
+
+from typing import Any, Dict
+from ttfquery import ttffiles
+import logging
 log = logging.getLogger( __name__ )
 
 def buildTable( registry ):
@@ -11,9 +13,10 @@ def buildTable( registry ):
     otherwise the full set of system fonts provided
     by findsystem will be used.
     """
-    table = {}
+    #: family -> font name -> modifier set -> (font name, file name)
+    table: Dict[Any, Dict[Any, Dict[Any, Any]]] = {}
     for major, minors in registry.families.items():
-        for minor, fonts in minors.items():
+        for _minor, fonts in minors.items():
             for fontname in fonts.keys():
                 table.setdefault(major,{}).setdefault(fontname, {})
                 font = registry.fonts.get(fontname)
@@ -46,5 +49,5 @@ def run_report(table):
         fnts = sorted( table[fam].items() )
         for fnt,modset in fnts:
             mods = sorted(modset.keys())
-            mods = ",".join([ '%s%s'%( w, ['','(I)'][i&1]) for (w,i) in mods])
-            print('    ',fnt.ljust(32), '--', mods)
+            shown = ",".join([ '%s%s'%( w, ['','(I)'][i&1]) for (w,i) in mods])
+            print('    ',fnt.ljust(32), '--', shown)

{ttfquery-2.0.1a1 → ttfquery-2.1.0}/ttfquery/ttfmetadata.py

@@ -3,7 +3,7 @@
 from __future__ import print_function
 #from ttfquery import describe
 from ttfquery import ttffiles
-import sys, logging
+import logging
 
 def printMetaData( metadata ):
     print('    Specific Name:', metadata.specific_name)
@@ -35,7 +35,7 @@ def find_match(name, registry):
         specifics.sort()
         for specific in specifics:
             printMetaData( registry.metadata( registry.fontFile(specific) ))
-    
-    
+
+
 if __name__ == "__main__":
     main()

ttfquery-2.0.1a1/pyproject.toml

@@ -1,55 +0,0 @@
-[build-system]
-requires = ["setuptools>=61.0"]
-build-backend = "setuptools.build_meta"
-
-[project]
-name = "TTFQuery"
-dynamic = ["version"]
-description = "FontTools-based package for querying system fonts"
-readme = "README.md"
-license = { file = "license.txt" }
-authors = [
-    { name = "Mike C. Fletcher", email = "mcfletch@users.sourceforge.net" },
-]
-requires-python = ">=3.7"
-dependencies = [
-    "fonttools",
-    "numpy",
-]
-keywords = [
-    "fonttools",
-    "ttf",
-    "truetype",
-    "outline",
-    "font",
-    "curve",
-    "system fonts",
-]
-classifiers = [
-    "Programming Language :: Python",
-    "Topic :: Software Development :: Libraries :: Python Modules",
-    "Intended Audience :: Developers",
-    "Operating System :: OS Independent",
-    "Topic :: Multimedia :: Graphics",
-]
-
-[project.urls]
-Homepage = "http://ttfquery.sourceforge.net/"
-
-[project.optional-dependencies]
-test = [
-    "pytest",
-    "pytest-cov",
-]
-
-[project.scripts]
-ttffiles = "ttfquery.ttffiles:main"
-ttffamily = "ttfquery.ttffamily:main"
-ttfgroups = "ttfquery.ttfgroups:main"
-ttfmetadata = "ttfquery.ttfmetadata:main"
-
-[tool.setuptools]
-packages = ["ttfquery"]
-
-[tool.setuptools.dynamic]
-version = { attr = "ttfquery.__version__" }

ttfquery-2.0.1a1/tests/test_describe.py

@@ -1,20 +0,0 @@
-from __future__ import print_function
-from ttfquery import describe, findsystem
-import pytest
-import sys, glob, unittest
-
-class TestDescribe(unittest.TestCase):
-    def test_describe_system_fonts(self):
-        for fontfile in list(findsystem.findFonts())[:100]:
-            try:
-                font = describe.openFont(fontfile)
-            except Exception as err:
-                err.args += ('Error opening font', font)
-                raise 
-            else:
-                short = describe.shortName( font )
-                assert short, "Null name for font %s"%(fontfile,)
-                family = describe.family( font )
-                assert len(family)==2, family
-                modifiers = describe.modifiers( font )
-                assert describe.weightName(modifiers[0])