openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/bug-801000 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #801000 in OpenLP: "Enchant on OS X with certain locales throws an Error exception"
  https://bugs.launchpad.net/openlp/+bug/801000

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/bug-801000/+merge/65617

Fix bug #801000 where Enchant falls over in one or two situations where there is no locale set or it encounters some other problem and generates a generic Error.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/bug-801000/+merge/65617
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/bug-801000 into lp:openlp.

=== modified file 'openlp/core/lib/spelltextedit.py'
--- openlp/core/lib/spelltextedit.py	2011-06-12 16:02:52 +0000
+++ openlp/core/lib/spelltextedit.py	2011-06-23 05:29:26 +0000
@@ -29,6 +29,7 @@
 try:
     import enchant
     from enchant import DictNotFoundError
+    from enchant.errors import Error
     ENCHANT_AVAILABLE = True
 except ImportError:
     ENCHANT_AVAILABLE = False
@@ -56,7 +57,7 @@
                 self.dictionary = enchant.Dict()
                 self.highlighter = Highlighter(self.document())
                 self.highlighter.spellingDictionary = self.dictionary
-            except DictNotFoundError:
+            except Error, DictNotFoundError:
                 ENCHANT_AVAILABLE = False
                 log.debug(u'Could not load default dictionary')