diff --git a/installer/windows/freeze.py b/installer/windows/freeze.py index 7b748057cc..007217803e 100644 --- a/installer/windows/freeze.py +++ b/installer/windows/freeze.py @@ -171,7 +171,7 @@ def main(args=sys.argv): 'calibre.web.feeds.recipes.*', 'PyQt4.QtWebKit', 'PyQt4.QtNetwork', ], - 'packages' : ['PIL', 'lxml'], + 'packages' : ['PIL', 'lxml', 'cherrypy'], 'excludes' : ["Tkconstants", "Tkinter", "tcl", "_imagingtk", "ImageTk", "FixTk" ], diff --git a/src/calibre/constants.py b/src/calibre/constants.py index 5322a3a176..8721196293 100644 --- a/src/calibre/constants.py +++ b/src/calibre/constants.py @@ -2,7 +2,7 @@ __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net' __docformat__ = 'restructuredtext en' __appname__ = 'calibre' -__version__ = '0.4.102' +__version__ = '0.4.103' __author__ = "Kovid Goyal " ''' Various run time constants. diff --git a/src/calibre/gui2/dialogs/config.ui b/src/calibre/gui2/dialogs/config.ui index 2699a92d37..66fa5bdf5c 100644 --- a/src/calibre/gui2/dialogs/config.ui +++ b/src/calibre/gui2/dialogs/config.ui @@ -7,7 +7,7 @@ 0 0 709 - 840 + 563 diff --git a/src/calibre/gui2/tools.py b/src/calibre/gui2/tools.py index 68d90f5228..d8497c9713 100644 --- a/src/calibre/gui2/tools.py +++ b/src/calibre/gui2/tools.py @@ -124,6 +124,8 @@ def convert_single_lrf(parent, db, comics, others): break except: continue + if data is None: + continue pt = PersistentTemporaryFile('.'+fmt) pt.write(data) pt.close()