version 0.4.75

This commit is contained in:
Kovid Goyal 2008-06-30 13:15:50 -07:00
parent ff81ab5db7
commit 48d37fffc9
4 changed files with 5 additions and 4 deletions

View File

@ -1,7 +1,7 @@
''' E-book management software''' ''' E-book management software'''
__license__ = 'GPL v3' __license__ = 'GPL v3'
__copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>' __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
__version__ = '0.4.74' __version__ = '0.4.75'
__docformat__ = "epytext" __docformat__ = "epytext"
__author__ = "Kovid Goyal <kovid at kovidgoyal.net>" __author__ = "Kovid Goyal <kovid at kovidgoyal.net>"
__appname__ = 'calibre' __appname__ = 'calibre'

View File

@ -6,7 +6,7 @@ __docformat__ = 'restructuredtext en'
""" """
Provides abstraction for metadata reading.writing from a variety of ebook formats. Provides abstraction for metadata reading.writing from a variety of ebook formats.
""" """
import os, mimetypes import os, mimetypes, sys
from urllib import unquote, quote from urllib import unquote, quote
from urlparse import urlparse from urlparse import urlparse
@ -55,6 +55,8 @@ class Resource(object):
path = href_or_path path = href_or_path
if not os.path.isabs(path): if not os.path.isabs(path):
path = os.path.abspath(os.path.join(path, basedir)) path = os.path.abspath(os.path.join(path, basedir))
if isinstance(path, str):
path = path.decode(sys.getfilesystemencoding())
self.path = path self.path = path
else: else:
url = urlparse(href_or_path) url = urlparse(href_or_path)

View File

@ -1421,7 +1421,6 @@ ALTER TABLE books ADD COLUMN isbn TEXT DEFAULT "" COLLATE NOCASE;
name = au + ' - ' + title if byauthor else title + ' - ' + au name = au + ' - ' + title if byauthor else title + ' - ' + au
name += '_'+id name += '_'+id
base = dir if single_dir else tpath base = dir if single_dir else tpath
mi = OPFCreator(base, self.get_metadata(idx, index_is_id=index_is_id)) mi = OPFCreator(base, self.get_metadata(idx, index_is_id=index_is_id))
cover = self.cover(idx, index_is_id=index_is_id) cover = self.cover(idx, index_is_id=index_is_id)
if cover is not None: if cover is not None:

View File

@ -10,7 +10,7 @@ from sphinx.ext.autodoc import get_module_charset, prepare_docstring
from docutils.statemachine import ViewList from docutils.statemachine import ViewList
from docutils import nodes from docutils import nodes
from genshi.template import OldTextTemplate from genshi.template import OldTextTemplate as TextTemplate
sys.path.append(os.path.abspath('../../../')) sys.path.append(os.path.abspath('../../../'))
from calibre.linux import entry_points from calibre.linux import entry_points