From: Stefano Rivera Date: Thu, 8 Oct 2015 10:29:38 -0700 Subject: Use Debian's figlet fonts. Look in /usr/share/figlet rather than using pkg_resources to find fonts. Forwarded: not-needed Last-Update: 2014-07-26 --- pyfiglet/__init__.py | 2 +- pyfiglet/fonts/__init__.py | 1 + pyfiglet/test.py | 6 +++--- setup.py | 1 - 4 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 pyfiglet/fonts/__init__.py diff --git a/pyfiglet/__init__.py b/pyfiglet/__init__.py index d1dece9..d285f13 100755 --- a/pyfiglet/__init__.py +++ b/pyfiglet/__init__.py @@ -58,7 +58,7 @@ RESET_COLORS = b'\033[0m' if sys.platform == 'win32': SHARED_DIRECTORY = os.path.join(os.environ["APPDATA"], "pyfiglet") else: - SHARED_DIRECTORY = '/usr/local/share/pyfiglet/' + SHARED_DIRECTORY = '/usr/share/figlet/' def figlet_format(text, font=DEFAULT_FONT, **kwargs): diff --git a/pyfiglet/fonts/__init__.py b/pyfiglet/fonts/__init__.py new file mode 100644 index 0000000..d7da094 --- /dev/null +++ b/pyfiglet/fonts/__init__.py @@ -0,0 +1 @@ +# Not shipped by Debian, we use toilet's free fonts instead. diff --git a/pyfiglet/test.py b/pyfiglet/test.py index a510663..61d26d9 100755 --- a/pyfiglet/test.py +++ b/pyfiglet/test.py @@ -44,9 +44,9 @@ class Test(object): def outputUsingFigletorToilet(self, text, font, fontpath): if os.path.isfile(fontpath + '.flf'): - cmd = ('figlet', '-d', 'pyfiglet/fonts', '-f', font, text) + cmd = ('figlet', '-d', '/usr/share/figlet', '-f', font, text) elif os.path.isfile(fontpath + '.tlf'): - cmd = ('toilet', '-d', 'pyfiglet/fonts', '-f', font, text) + cmd = ('toilet', '-d', '/usr/share/figlet', '-f', font, text) else: raise Exception('Missing font file: {}'.format(fontpath)) @@ -81,7 +81,7 @@ class Test(object): def check_font(self, text, font): if font in self.skip: return - fontpath = os.path.join('pyfiglet', 'fonts', font) + fontpath = os.path.join('/usr/share/figlet', font) self.f.setFont(font=font) diff --git a/setup.py b/setup.py index fd81129..7d31410 100755 --- a/setup.py +++ b/setup.py @@ -46,7 +46,6 @@ setup( author_email='p@pwaller.net', url='https://github.com/pwaller/pyfiglet', packages=['pyfiglet', 'pyfiglet.fonts'], - package_data={'pyfiglet.fonts': ['*.flf', '*.flc']}, entry_points={ 'console_scripts': [ 'pyfiglet = pyfiglet:main',