diff --git a/src/calibre/ebooks/metadata/sources/test.py b/src/calibre/ebooks/metadata/sources/test.py index e280b0c038..c55f963003 100644 --- a/src/calibre/ebooks/metadata/sources/test.py +++ b/src/calibre/ebooks/metadata/sources/test.py @@ -67,6 +67,23 @@ def authors_test(authors): return test +def series_test(series, series_index): + series = series.lower() + + def test(mi): + ms = mi.series.lower() if mi.series else '' + if (ms == series) and (series_index == mi.series_index): + return True + if mi.series: + prints('Series test failed. Expected: \'%s [%d]\' found \'%s[%d]\''% \ + (series, series_index, ms, mi.series_index)) + else: + prints('Series test failed. Expected: \'%s [%d]\' found no series'% \ + (series, series_index)) + return False + + return test + def init_test(tdir_name): tdir = tempfile.gettempdir() lf = os.path.join(tdir, tdir_name.replace(' ', '')+'_identify_test.txt') diff --git a/src/calibre/gui2/dialogs/tweak_epub.py b/src/calibre/gui2/dialogs/tweak_epub.py index a42fb07e40..edc274c9b2 100755 --- a/src/calibre/gui2/dialogs/tweak_epub.py +++ b/src/calibre/gui2/dialogs/tweak_epub.py @@ -12,7 +12,7 @@ from zipfile import ZipFile, ZIP_DEFLATED, ZIP_STORED from PyQt4.Qt import QDialog -from calibre.constants import isosx, iswindows +from calibre.constants import isosx from calibre.gui2 import open_local_file from calibre.gui2.dialogs.tweak_epub_ui import Ui_Dialog from calibre.libunzip import extract as zipextract