1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
Description: Use Debian's figlet fonts.
Look in /usr/share/figlet rather than using pkg_resources to find fonts.
Author: Stefano Rivera <stefanor@debian.org>
Forwarded: not-needed
Last-Update: 2011-05-29
--- a/pyfiglet/__init__.py
+++ b/pyfiglet/__init__.py
@@ -5,7 +5,7 @@
"""
import os
-import pkg_resources
+import os.path
import re
import sys
from optparse import OptionParser
@@ -82,8 +82,8 @@
for extension in ('tlf', 'flf'):
fn = '%s.%s' % (font, extension)
- if pkg_resources.resource_exists('pyfiglet.fonts', fn):
- self.data = pkg_resources.resource_string('pyfiglet.fonts', fn)
+ if os.path.isfile(os.path.join('/usr/share/figlet', fn)):
+ self.data = open(os.path.join('/usr/share/figlet', fn)).read()
break
else:
raise FontNotFound(font)
@@ -93,10 +93,10 @@
@classmethod
def getFonts(self):
return [font.rsplit('.', 2)[0] for font
- in pkg_resources.resource_listdir('pyfiglet', 'fonts')
+ in os.listdir('/usr/share/figlet')
if font.endswith(('.flf', '.tlf'))
- and self.reMagicNumber.search(pkg_resources.resource_stream(
- 'pyfiglet.fonts', font).readline())]
+ and self.reMagicNumber.search(open(os.path.join(
+ '/usr/share/figlet', font)).readline())]
def loadFont(self):
"""
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,6 @@
author='Peter Waller (Thanks to Christopher Jones and Stefano Rivera)',
author_email='peter.waller@gmail.com',
url='https://github.com/pwaller/pyfiglet',
- packages=['pyfiglet', 'pyfiglet.fonts'],
- package_data={'pyfiglet.fonts' : ['pyfiglet/fonts/*.flf']},
+ packages=['pyfiglet'],
)
|
