Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1550 (html table handling in v0.4.124)

Browse Source
This commit is contained in:
Kovid Goyal 2009-01-05 10:10:22 -08:00
parent c524170f71
commit cb6599bbc1
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
installer/linux/freeze.py
View File

@ -16,6 +16,7 @@ def freeze():
from calibre.linux import entry_points from calibre.linux import entry_points
from calibre import walk from calibre import walk
from calibre.web.feeds.recipes import recipe_modules from calibre.web.feeds.recipes import recipe_modules
from calibre.ebooks.lrf.fonts import FONT_MAP
import calibre import calibre
@ -72,6 +73,7 @@ def freeze():
os.makedirs(DIST_DIR) os.makedirs(DIST_DIR)
includes = [x[0] for x in executables.values()] includes = [x[0] for x in executables.values()]
includes += ['calibre.ebooks.lrf.fonts.prs500.'+x for x in FONT_MAP.values()]
excludes = ['matplotlib', "Tkconstants", "Tkinter", "tcl", "_imagingtk", excludes = ['matplotlib', "Tkconstants", "Tkinter", "tcl", "_imagingtk",
"ImageTk", "FixTk", 'wx', 'PyQt4.QtAssistant', 'PyQt4.QtOpenGL.so', "ImageTk", "FixTk", 'wx', 'PyQt4.QtAssistant', 'PyQt4.QtOpenGL.so',

2
installer/osx/freeze.py
View File

@ -326,7 +326,7 @@ def main():
'genshi', 'calibre.web.feeds.recipes.*', 'genshi', 'calibre.web.feeds.recipes.*',
'calibre.ebooks.lrf.any.*', 'calibre.ebooks.lrf.feeds.*', 'calibre.ebooks.lrf.any.*', 'calibre.ebooks.lrf.feeds.*',
'keyword', 'codeop', 'pydoc', 'readline', 'keyword', 'codeop', 'pydoc', 'readline',
'BeautifulSoup' 'BeautifulSoup', 'calibre.ebooks.lrf.fonts.prs500.*',
], ],
'packages' : ['PIL', 'Authorization', 'lxml'], 'packages' : ['PIL', 'Authorization', 'lxml'],
'excludes' : ['IPython'], 'excludes' : ['IPython'],

1
installer/windows/freeze.py
View File

@ -176,6 +176,7 @@ def main(args=sys.argv):
'BeautifulSoup', 'pyreadline', 'BeautifulSoup', 'pyreadline',
'pydoc', 'IPython.Extensions.*', 'pydoc', 'IPython.Extensions.*',
'calibre.web.feeds.recipes.*', 'calibre.web.feeds.recipes.*',
'calibre.ebooks.lrf.fonts.prs500.*',
'PyQt4.QtWebKit', 'PyQt4.QtNetwork', 'PyQt4.QtWebKit', 'PyQt4.QtNetwork',
], ],
'packages' : ['PIL', 'lxml', 'cherrypy'], 'packages' : ['PIL', 'lxml', 'cherrypy'],

3
src/calibre/ebooks/lrf/fonts/__init__.py
View File

@ -50,7 +50,8 @@ def get_font_path(name):
try: try:
font_mod = __import__('calibre.ebooks.lrf.fonts.prs500', {}, {}, font_mod = __import__('calibre.ebooks.lrf.fonts.prs500', {}, {},
[fname], -1) [fname], -1)
except ImportError: getattr(font_mod, fname)
except ImportError, AttributeError:
font_mod = __import__('calibre.ebooks.lrf.fonts.liberation', {}, {}, font_mod = __import__('calibre.ebooks.lrf.fonts.liberation', {}, {},
[LIBERATION_FONT_MAP[name]], -1) [LIBERATION_FONT_MAP[name]], -1)
p = PersistentTemporaryFile('.ttf', 'font_') p = PersistentTemporaryFile('.ttf', 'font_')