From 9eee4a67b653dd7a15e759f897ff92fe880dbf06 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 9 Oct 2007 23:34:25 +0000
Subject: [PATCH] oops

---
 src/libprs500/ebooks/lrf/__init__.py | 2 +-
 src/libprs500/ebooks/metadata/opf.py | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/libprs500/ebooks/lrf/__init__.py b/src/libprs500/ebooks/lrf/__init__.py
index 0f8ebe86e1..0f6519b296 100644
--- a/src/libprs500/ebooks/lrf/__init__.py
+++ b/src/libprs500/ebooks/lrf/__init__.py
@@ -292,7 +292,7 @@ def Book(options, logger, font_delta=0, header=None,
             raise ConversionError, 'Could not find the normal version of the ' + family + ' font'
     return book, fonts
 
-def entity_to_unicode(self, match):
+def entity_to_unicode(match):
     ent = match.group(1)
     if ent.startswith(u'#x'):
         return unichr(int(ent[2:], 16))
diff --git a/src/libprs500/ebooks/metadata/opf.py b/src/libprs500/ebooks/metadata/opf.py
index 4d77ef6bb3..855fd68cba 100644
--- a/src/libprs500/ebooks/metadata/opf.py
+++ b/src/libprs500/ebooks/metadata/opf.py
@@ -51,11 +51,12 @@ class OPFReader(MetaInformation):
                 if not role:
                     role = elem.get('opf:role')
                 if role == 'aut':
-                    au = elem.string.split(',')
+                    raw = self.ENTITY_PATTERN.sub(entity_to_unicode, elem.string)
+                    au = raw.split(',')
                     ans = []
                     for i in au:
                         ans.extend(i.split('&'))
-                    return self.ENTITY_PATTERN.sub(entity_to_unicode, ans)
+                    return ans
             return None
         return property(doc=doc, fget=fget)