From 6e831360a29d9f9e181f238a5565bff3fb7dc253 Mon Sep 17 00:00:00 2001
From: Sengian <sengian1@gmail.com>
Date: Mon, 10 Jan 2011 21:27:45 +0100
Subject: [PATCH] Fix 0 case in rtf cp + case when there is no pictures in a
 file

---
 src/calibre/ebooks/rtf2xml/default_encoding.py | 6 ++++--
 src/calibre/ebooks/rtf2xml/pict.py             | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/calibre/ebooks/rtf2xml/default_encoding.py b/src/calibre/ebooks/rtf2xml/default_encoding.py
index e145a8a75e..c7e030e48b 100755
--- a/src/calibre/ebooks/rtf2xml/default_encoding.py
+++ b/src/calibre/ebooks/rtf2xml/default_encoding.py
@@ -101,7 +101,7 @@ class DefaultEncoding:
                         break
                     if self.__token_info == 'cw<ri<ansi-codpg':
                         #cw<ri<ansi-codpg<nu<10000
-                        self.__code_page = line[20:-1] if line[20:-1] \
+                        self.__code_page = line[20:-1] if int(line[20:-1]) \
                                             else '1252'
                     if self.__token_info == 'cw<ri<macintosh_':
                         self.__platform = 'Macintosh'
@@ -120,7 +120,9 @@ class DefaultEncoding:
                 fenccp = re.compile(r'\\ansicpg(\d+)[\\ \{\}\t\n]+')
                 for line in read_obj:
                     if fenccp.search(line):
-                        self.__code_page = fenccp.search(line).group(1)
+                        cp = fenccp.search(line).group(1)
+                        if not int(cp):
+                            self.__code_page = cp
                         break
                     if fenc.search(line):
                         enc = fenc.search(line).group(1)
diff --git a/src/calibre/ebooks/rtf2xml/pict.py b/src/calibre/ebooks/rtf2xml/pict.py
index a6cc2deade..a8f7746f60 100755
--- a/src/calibre/ebooks/rtf2xml/pict.py
+++ b/src/calibre/ebooks/rtf2xml/pict.py
@@ -168,7 +168,10 @@ class Pict:
         copy_obj = copy.Copy(bug_handler = self.__bug_handler)
         if self.__copy:
             copy_obj.copy_file(self.__write_to, "pict.data")
-            copy_obj.copy_file(self.__pict_file, "pict.rtf")
+            try:
+                copy_obj.copy_file(self.__pict_file, "pict.rtf")
+            except:
+                pass
         copy_obj.rename(self.__write_to, self.__file)
         os.remove(self.__write_to)
         if self.__pict_count == 0: