From 71dea7b4ee05eefd5b1d4fb350b4ccd0ee79a024 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 12 Jan 2009 16:52:50 -0800
Subject: [PATCH] Fix #1410 (Error using preview on downloaded news)

---
 src/calibre/debug.py              | 6 +++++-
 src/calibre/ebooks/lrf/objects.py | 4 +++-
 src/calibre/utils/zipfile.py      | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/calibre/debug.py b/src/calibre/debug.py
index 274089baa1..81336953e1 100644
--- a/src/calibre/debug.py
+++ b/src/calibre/debug.py
@@ -43,7 +43,11 @@ def update_module(mod, path):
         zp = os.path.join(os.path.dirname(sys.executable), 'library.zip')
     elif isosx:
         zp = os.path.join(os.path.dirname(getattr(sys, 'frameworks_dir')),
-                            'Resources', 'lib', 'python2.5', 'site-packages.zip')
+                            'Resources', 'lib', 
+                            'python'+'.'.join(map(str, sys.version_info[:2])), 
+                            'site-packages.zip')
+    else:
+        zp = os.path.join(getattr(sys, 'frozen_path'), 'loader.zip')
     if zp is not None:
         update_zipfile(zp, mod, path)
     else:
diff --git a/src/calibre/ebooks/lrf/objects.py b/src/calibre/ebooks/lrf/objects.py
index 29c0d8de44..23ee62c0b5 100644
--- a/src/calibre/ebooks/lrf/objects.py
+++ b/src/calibre/ebooks/lrf/objects.py
@@ -1166,7 +1166,9 @@ class TOCObject(LRFStream):
             refpage = struct.unpack("<I", stream.read(4))[0]
             refobj  = struct.unpack("<I", stream.read(4))[0]
             cnt = struct.unpack("<H", stream.read(2))[0]
-            label = unicode(stream.read(cnt), "utf_16")
+            raw = stream.read(cnt)
+            print repr(raw) 
+            label = raw.decode('utf_16_le')
             self._contents.append(TocLabel(refpage, refobj, label))
             c -= 1
             
diff --git a/src/calibre/utils/zipfile.py b/src/calibre/utils/zipfile.py
index 5bf96b25dc..351e033f1b 100644
--- a/src/calibre/utils/zipfile.py
+++ b/src/calibre/utils/zipfile.py
@@ -338,7 +338,7 @@ class ZipInfo (object):
         if isinstance(self.filename, unicode):
             try:
                 return self.filename.encode('ascii'), self.flag_bits
-            except UnicodeEncodeError:
+            except:
                 return self.filename.encode('utf-8'), self.flag_bits | 0x800
         else:
             return self.filename, self.flag_bits