From d91724d76caed6a4317ea1719a0fd71dd494eaa3 Mon Sep 17 00:00:00 2001 From: Cosimo Lupo Date: Mon, 4 May 2020 17:37:24 +0100 Subject: [PATCH] Revert "[doc] Add help options to fonttools CLI" --- Lib/fontTools/__main__.py | 6 ++---- Lib/fontTools/cu2qu/__main__.py | 1 - Lib/fontTools/feaLib/__main__.py | 1 - Lib/fontTools/help.py | 32 -------------------------------- Lib/fontTools/mtiLib/__main__.py | 2 -- Lib/fontTools/subset/__main__.py | 2 -- Lib/fontTools/varLib/__main__.py | 2 -- 7 files changed, 2 insertions(+), 44 deletions(-) delete mode 100644 Lib/fontTools/help.py diff --git a/Lib/fontTools/__main__.py b/Lib/fontTools/__main__.py index 9b978aaa7..ba09c7fc6 100644 --- a/Lib/fontTools/__main__.py +++ b/Lib/fontTools/__main__.py @@ -5,6 +5,8 @@ def main(args=None): if args is None: args = sys.argv[1:] + # TODO Add help output, --help, etc. + # TODO Handle library-wide options. Eg.: # --unicodedata # --verbose / other logging stuff @@ -18,10 +20,6 @@ def main(args=None): # can be added. Should we just try importing the fonttools # module first and try without if it fails? - if len(sys.argv) < 2: - sys.argv.append("help") - if sys.argv[1] == "-h" or sys.argv[1] == "--help": - sys.argv[1] = "help" mod = 'fontTools.'+sys.argv[1] sys.argv[1] = sys.argv[0] + ' ' + sys.argv[1] del sys.argv[0] diff --git a/Lib/fontTools/cu2qu/__main__.py b/Lib/fontTools/cu2qu/__main__.py index 32715062f..084bf8f96 100644 --- a/Lib/fontTools/cu2qu/__main__.py +++ b/Lib/fontTools/cu2qu/__main__.py @@ -1,4 +1,3 @@ -"""Convert a UFO font with cubic curves to quadratic curves""" import sys from .cli import main diff --git a/Lib/fontTools/feaLib/__main__.py b/Lib/fontTools/feaLib/__main__.py index 81ba360ac..b69307e84 100644 --- a/Lib/fontTools/feaLib/__main__.py +++ b/Lib/fontTools/feaLib/__main__.py @@ -1,4 +1,3 @@ -"""Add features from a feature file (.fea) into a OTF font""" from fontTools.misc.py23 import * from fontTools.ttLib import TTFont from fontTools.feaLib.builder import addOpenTypeFeatures, Builder diff --git a/Lib/fontTools/help.py b/Lib/fontTools/help.py deleted file mode 100644 index b707c9f09..000000000 --- a/Lib/fontTools/help.py +++ /dev/null @@ -1,32 +0,0 @@ -"""Show this help""" -import pkgutil -import sys -from setuptools import find_packages -from pkgutil import iter_modules -import fontTools -import importlib - - -def describe(pkg): - try: - description = __import__( - "fontTools." + pkg + ".__main__", globals(), locals(), ["__doc__"] - ).__doc__ - print("fonttools %-10s %s" % (pkg, description), file=sys.stderr) - except Exception as e: - return None - - -def show_help_list(): - path = fontTools.__path__[0] - for pkg in find_packages(path): - qualifiedPkg = "fontTools." + pkg - describe(pkg) - pkgpath = path + "/" + qualifiedPkg.replace(".", "/") - for info in iter_modules([pkgpath]): - describe(pkg + "." + info.name) - - -if __name__ == "__main__": - print("fonttools v%s\n" % fontTools.__version__, file=sys.stderr) - show_help_list() diff --git a/Lib/fontTools/mtiLib/__main__.py b/Lib/fontTools/mtiLib/__main__.py index 0d4183b54..eacfefd59 100644 --- a/Lib/fontTools/mtiLib/__main__.py +++ b/Lib/fontTools/mtiLib/__main__.py @@ -1,8 +1,6 @@ -"""Convert Monotype FontDame layout files to TTX""" from fontTools.misc.py23 import * import sys from fontTools.mtiLib import main - if __name__ == '__main__': sys.exit(main()) diff --git a/Lib/fontTools/subset/__main__.py b/Lib/fontTools/subset/__main__.py index e1d9f123a..3f3d894a0 100644 --- a/Lib/fontTools/subset/__main__.py +++ b/Lib/fontTools/subset/__main__.py @@ -1,8 +1,6 @@ -"""OpenType font subsetter and optimizer""" from fontTools.misc.py23 import * import sys from fontTools.subset import main - if __name__ == '__main__': sys.exit(main()) diff --git a/Lib/fontTools/varLib/__main__.py b/Lib/fontTools/varLib/__main__.py index c147b4980..29657401d 100644 --- a/Lib/fontTools/varLib/__main__.py +++ b/Lib/fontTools/varLib/__main__.py @@ -1,7 +1,5 @@ -"""Build a variable font from a designspace file and masters""" import sys from fontTools.varLib import main - if __name__ == '__main__': sys.exit(main())