From ddb11549b2d370d8515f0fa6ecd9397ba6d74fb7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 5 Jun 2015 17:49:40 +0530
Subject: [PATCH] ...

---
 src/calibre/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py
index 4a5896aad8..0edb673093 100644
--- a/src/calibre/__init__.py
+++ b/src/calibre/__init__.py
@@ -76,8 +76,8 @@ def patheq(p1, p2):
     return d(p1) == d(p2)
 
 def unicode_path(path, abs=False):
-    if not isinstance(path, unicode):
-        path = path.decode(sys.getfilesystemencoding())
+    if isinstance(path, bytes):
+        path = path.decode(filesystem_encoding)
     if abs:
         path = os.path.abspath(path)
     return path