From ea663b93972378b5e4aac8f2c3c5e7a949dc8dbd Mon Sep 17 00:00:00 2001 From: GRiker Date: Sat, 19 May 2012 10:37:49 -0600 Subject: [PATCH 1/2] Fixed problem causing crash when using non-ASCII characters in custom column names specified in catalog build --- src/calibre/gui2/catalog/catalog_epub_mobi.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/calibre/gui2/catalog/catalog_epub_mobi.py b/src/calibre/gui2/catalog/catalog_epub_mobi.py index 8af72e51c0..2a01532e6f 100644 --- a/src/calibre/gui2/catalog/catalog_epub_mobi.py +++ b/src/calibre/gui2/catalog/catalog_epub_mobi.py @@ -291,8 +291,8 @@ class PluginWidget(QWidget,Ui_Form): Currently using QLineEdit for all field types Possible to modify to switch QWidget type ''' - new_source = str(self.read_source_field.currentText()) - read_source_spec = self.read_source_fields[str(new_source)] + new_source = unicode(self.read_source_field.currentText()) + read_source_spec = self.read_source_fields[new_source] self.read_source_field_name = read_source_spec['field'] # Change pattern input widget to match the source field datatype @@ -314,7 +314,7 @@ class PluginWidget(QWidget,Ui_Form): new_source = str(self.exclude_source_field.currentText()) self.exclude_source_field_name = new_source if new_source > '': - exclude_source_spec = self.exclude_source_fields[str(new_source)] + exclude_source_spec = self.exclude_source_fields[unicode(new_source)] self.exclude_source_field_name = exclude_source_spec['field'] self.exclude_pattern.setEnabled(True) @@ -360,7 +360,7 @@ class PluginWidget(QWidget,Ui_Form): new_source = str(self.header_note_source_field.currentText()) self.header_note_source_field_name = new_source if new_source > '': - header_note_source_spec = self.header_note_source_fields[str(new_source)] + header_note_source_spec = self.header_note_source_fields[unicode(new_source)] self.header_note_source_field_name = header_note_source_spec['field'] def merge_source_field_changed(self,new_index): @@ -370,7 +370,7 @@ class PluginWidget(QWidget,Ui_Form): new_source = str(self.merge_source_field.currentText()) self.merge_source_field_name = new_source if new_source > '': - merge_source_spec = self.merge_source_fields[str(new_source)] + merge_source_spec = self.merge_source_fields[unicode(new_source)] self.merge_source_field_name = merge_source_spec['field'] if not self.merge_before.isChecked() and not self.merge_after.isChecked(): self.merge_after.setChecked(True) From 36ad3a4c2cc0adeff9731800e3a62eb21b5d1fee Mon Sep 17 00:00:00 2001 From: GRiker Date: Sat, 19 May 2012 10:39:31 -0600 Subject: [PATCH 2/2] Fixed comment in merge_source_field_changed --- src/calibre/gui2/catalog/catalog_epub_mobi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/gui2/catalog/catalog_epub_mobi.py b/src/calibre/gui2/catalog/catalog_epub_mobi.py index 2a01532e6f..3cfd94cc6e 100644 --- a/src/calibre/gui2/catalog/catalog_epub_mobi.py +++ b/src/calibre/gui2/catalog/catalog_epub_mobi.py @@ -365,7 +365,7 @@ class PluginWidget(QWidget,Ui_Form): def merge_source_field_changed(self,new_index): ''' - Process changes in the header_note_source_field combo box + Process changes in the merge_source_field combo box ''' new_source = str(self.merge_source_field.currentText()) self.merge_source_field_name = new_source