From b40e5bba6e46ddbf94d4d6376564b19c12fc1fb6 Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Wed, 6 Oct 2010 09:28:05 +0100
Subject: [PATCH] Two robustness changes for formatting custom series indices

---
 src/calibre/ebooks/metadata/book/base.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py
index 9067277bfb..45f69508c1 100644
--- a/src/calibre/ebooks/metadata/book/base.py
+++ b/src/calibre/ebooks/metadata/book/base.py
@@ -461,7 +461,7 @@ class Metadata(object):
         v = self.series_index if val is None else val
         try:
             x = float(v)
-        except ValueError:
+        except ValueError, TypeError:
             x = 1
         return fmt_sidx(x)
 
@@ -516,8 +516,9 @@ class Metadata(object):
             if datatype == 'text' and cmeta['is_multiple']:
                 res = u', '.join(res)
             elif datatype == 'series' and series_with_index:
-                res = res + \
-                   ' [%s]'%self.format_series_index(val=self.get_extra(key))
+                if self.get_extra(key):
+                    res = res + \
+                        ' [%s]'%self.format_series_index(val=self.get_extra(key))
             elif datatype == 'datetime':
                 res = format_date(res, cmeta['display'].get('date_format','dd MMM yyyy'))
             elif datatype == 'bool':