From 45975b0c398cbd18d0927261b980fb2317951c30 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 1 Apr 2019 14:18:11 +0530
Subject: [PATCH] py3: Fix strftime on python3

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

diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py
index db6c1786b1..cd724b17fe 100644
--- a/src/calibre/__init__.py
+++ b/src/calibre/__init__.py
@@ -550,7 +550,9 @@ def strftime(fmt, t=None):
         fmt = fmt.replace(u'%e', u'%#d')
         ans = plugins['winutil'][0].strftime(fmt, t)
     else:
-        ans = time.strftime(fmt, t).decode(preferred_encoding, 'replace')
+        ans = time.strftime(fmt, t)
+        if isinstance(ans, bytes):
+            ans = ans.decode(preferred_encoding, 'replace')
     if early_year:
         ans = ans.replace(u'_early year hack##', unicode_type(orig_year))
     return ans