From f6665bc5c8b75789259fab8f13e4d74e9b9fecd3 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 19 Feb 2011 17:08:12 -0700 Subject: [PATCH] Fix regression in 0.7.46 that broke creating date and composite custom columns --- src/calibre/gui2/preferences/create_custom_column.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/calibre/gui2/preferences/create_custom_column.py b/src/calibre/gui2/preferences/create_custom_column.py index 5cd32a4af3..9974de472f 100644 --- a/src/calibre/gui2/preferences/create_custom_column.py +++ b/src/calibre/gui2/preferences/create_custom_column.py @@ -153,17 +153,17 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn): display_dict = {} if col_type == 'datetime': - if self.date_format_box.text().strip(): + if unicode(self.date_format_box.text()).strip(): display_dict = {'date_format':unicode(self.date_format_box.text()).strip()} else: display_dict = {'date_format': None} elif col_type == 'composite': - if not self.composite_box.text().strip(): + if not unicode(self.composite_box.text()).strip(): return self.simple_error('', _('You must enter a template for' ' composite columns')) display_dict = {'composite_template':unicode(self.composite_box.text()).strip()} elif col_type == 'enumeration': - if not self.enum_box.text(): + if not unicode(self.enum_box.text()).strip(): return self.simple_error('', _('You must enter at least one' ' value for enumeration columns')) l = [v.strip() for v in unicode(self.enum_box.text()).split(',')]