From 0d5c69cd64efeb5e15f938a17920d26b2891aa51 Mon Sep 17 00:00:00 2001 From: John Schember Date: Fri, 7 Jan 2011 18:46:14 -0500 Subject: [PATCH] Fix bug #8231. --- src/calibre/ebooks/pdb/palmdoc/reader.py | 6 +++--- src/calibre/ebooks/pdb/pdf/reader.py | 6 +++--- src/calibre/ebooks/pdb/ztxt/reader.py | 6 +++--- src/calibre/ebooks/tcr/input.py | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/calibre/ebooks/pdb/palmdoc/reader.py b/src/calibre/ebooks/pdb/palmdoc/reader.py index 945e31559a..439492ba0c 100644 --- a/src/calibre/ebooks/pdb/palmdoc/reader.py +++ b/src/calibre/ebooks/pdb/palmdoc/reader.py @@ -65,9 +65,9 @@ class Reader(FormatReader): from calibre.customize.ui import plugin_for_input_format txt_plugin = plugin_for_input_format('txt') - for option in txt_plugin.options: - if not hasattr(self.options, option.option.name): - setattr(self.options, option.name, option.recommended_value) + for opt in txt_plugin.options: + if not hasattr(self.options, opt.option.name): + setattr(self.options, opt.option.name, opt.recommended_value) stream.seek(0) return txt_plugin.convert(stream, self.options, 'txt', self.log, {}) diff --git a/src/calibre/ebooks/pdb/pdf/reader.py b/src/calibre/ebooks/pdb/pdf/reader.py index 30b0c4c57c..2a9636b083 100644 --- a/src/calibre/ebooks/pdb/pdf/reader.py +++ b/src/calibre/ebooks/pdb/pdf/reader.py @@ -31,9 +31,9 @@ class Reader(FormatReader): from calibre.customize.ui import plugin_for_input_format pdf_plugin = plugin_for_input_format('pdf') - for option in pdf_plugin.options: - if not hasattr(self.options, option.option.name): - setattr(self.options, option.name, option.recommended_value) + for opt in pdf_plugin.options: + if not hasattr(self.options, opt.option.name): + setattr(self.options, opt.option.name, opt.recommended_value) pdf.seek(0) return pdf_plugin.convert(pdf, self.options, 'pdf', self.log, {}) diff --git a/src/calibre/ebooks/pdb/ztxt/reader.py b/src/calibre/ebooks/pdb/ztxt/reader.py index 6e7f5dd923..cff7382754 100644 --- a/src/calibre/ebooks/pdb/ztxt/reader.py +++ b/src/calibre/ebooks/pdb/ztxt/reader.py @@ -83,9 +83,9 @@ class Reader(FormatReader): from calibre.customize.ui import plugin_for_input_format txt_plugin = plugin_for_input_format('txt') - for option in txt_plugin.options: - if not hasattr(self.options, option.option.name): - setattr(self.options, option.name, option.recommended_value) + for opt in txt_plugin.options: + if not hasattr(self.options, opt.option.name): + setattr(self.options, opt.option.name, opt.recommended_value) stream.seek(0) return txt_plugin.convert(stream, self.options, 'txt', self.log, {}) diff --git a/src/calibre/ebooks/tcr/input.py b/src/calibre/ebooks/tcr/input.py index aac72da7a8..4d15fd0923 100644 --- a/src/calibre/ebooks/tcr/input.py +++ b/src/calibre/ebooks/tcr/input.py @@ -26,9 +26,9 @@ class TCRInput(InputFormatPlugin): from calibre.customize.ui import plugin_for_input_format txt_plugin = plugin_for_input_format('txt') - for option in txt_plugin.options: - if not hasattr(options, option.option.name): - setattr(options, option.name, option.recommended_value) + for opt in txt_plugin.options: + if not hasattr(self.options, opt.option.name): + setattr(self.options, opt.option.name, opt.recommended_value) stream.seek(0) return txt_plugin.convert(stream, options,