From c73315bb51a3c6e7fedd7432e60abd5f3a65d3b9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 9 Jul 2008 13:54:01 -0700
Subject: [PATCH] Make xml_to_unicode robust against chardet failing.

---
 src/calibre/ebooks/chardet/__init__.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/calibre/ebooks/chardet/__init__.py b/src/calibre/ebooks/chardet/__init__.py
index 36d3b909de..55257e1962 100644
--- a/src/calibre/ebooks/chardet/__init__.py
+++ b/src/calibre/ebooks/chardet/__init__.py
@@ -15,6 +15,7 @@
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
 
+
 __version__ = "1.0"
 
 import re
@@ -55,6 +56,9 @@ def xml_to_unicode(raw, verbose=False):
             print 'WARNING: Encoding detection confidence %d%%'%(chardet['confidence']*100)
     CHARSET_ALIASES = { "macintosh" : "mac-roman",
                         "x-sjis" : "shift-jis" }
+    if not encoding:
+        from calibre import preferred_encoding
+        encoding = preferred_encoding
     if encoding:
         encoding = encoding.lower()
     if CHARSET_ALIASES.has_key(encoding):