From 313b4634d6697466ca984f623c0bc588fddee253 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 23 Jun 2012 13:23:48 +0530
Subject: [PATCH] KF8 Output: Fix a couple of bugs that could lead to
 generation of invalid KF8 files. Fixes #1016672 (broken rtf to azw3
 conversion)

---
 src/calibre/ebooks/mobi/writer8/skeleton.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/ebooks/mobi/writer8/skeleton.py b/src/calibre/ebooks/mobi/writer8/skeleton.py
index ae083163d2..5db6ee0b5c 100644
--- a/src/calibre/ebooks/mobi/writer8/skeleton.py
+++ b/src/calibre/ebooks/mobi/writer8/skeleton.py
@@ -111,7 +111,7 @@ class Skeleton(object):
         self.chunks = chunks
 
         self.skeleton = self.render(root)
-        self.body_offset = self.skeleton.find('<body')
+        self.body_offset = self.skeleton.find(b'<body')
         self.calculate_metrics(root)
 
         self.calculate_insert_positions()
@@ -127,7 +127,7 @@ class Skeleton(object):
         self.metrics = {}
         for tag in root.xpath('//*[@aid]'):
             text = (tag.text or '').encode('utf-8')
-            raw = tostring(tag, with_tail=True)
+            raw = close_self_closing_tags(tostring(tag, with_tail=True))
             start_length = len(raw.partition(b'>')[0]) + len(text) + 1
             end_length = len(raw.rpartition(b'<')[-1]) + 1
             self.metrics[tag.get('aid')] = Metric(start_length, end_length)