From 88fe4020f14f257a0c9fa31ee0ad50e7ad5d6439 Mon Sep 17 00:00:00 2001 From: "Marshall T. Vandegrift" Date: Tue, 27 Jan 2009 20:13:18 -0500 Subject: [PATCH] Handle external URIs in OEBBook URI processing. --- src/calibre/ebooks/oeb/base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/ebooks/oeb/base.py b/src/calibre/ebooks/oeb/base.py index 27e6318bd2..927592ac0e 100644 --- a/src/calibre/ebooks/oeb/base.py +++ b/src/calibre/ebooks/oeb/base.py @@ -447,7 +447,7 @@ class Manifest(object): return cmp(skey, okey) def relhref(self, href): - if '/' not in self.href: + if '/' not in self.href or ':' in href: return href base = os.path.dirname(self.href).split('/') target, frag = urldefrag(href) @@ -463,7 +463,7 @@ class Manifest(object): return relhref def abshref(self, href): - if '/' not in self.href: + if '/' not in self.href or ':' in href: return href dirname = os.path.dirname(self.href) href = os.path.join(dirname, href)