From 118b480fbe53a7a717ea09bdae5af0861bffbb29 Mon Sep 17 00:00:00 2001
From: GRiker <griker@hotmail.com>
Date: Tue, 9 Nov 2010 11:11:11 -0700
Subject: [PATCH] GwR fix for stream-sourced epub

---
 src/calibre/ebooks/metadata/epub.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/calibre/ebooks/metadata/epub.py b/src/calibre/ebooks/metadata/epub.py
index 675d189f7f..2f0271b785 100644
--- a/src/calibre/ebooks/metadata/epub.py
+++ b/src/calibre/ebooks/metadata/epub.py
@@ -109,12 +109,10 @@ class OCFZipReader(OCFReader):
             raise EPubException("not a ZIP .epub OCF container")
         self.root = root
         if self.root is None:
-            try:
-                self.root = os.getcwdu()
-            except:
-                pass
             if hasattr(stream, 'name'):
                 self.root = os.path.abspath(os.path.dirname(stream.name))
+            else:
+                self.root = os.getcwdu()
         super(OCFZipReader, self).__init__()
 
     def open(self, name, mode='r'):