summaryrefslogtreecommitdiff
blob: 09ded3540487aebd37e1d4181c39660c9ecdd9e0 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
diff --git a/pushbullet/filetype.py b/pushbullet/filetype.py
index a2f2be0..22ffedf 100644
--- a/pushbullet/filetype.py
+++ b/pushbullet/filetype.py
@@ -1,13 +1,22 @@
 def _magic_get_file_type(f, _):
     file_type = magic.from_buffer(f.read(1024), mime=True)
     f.seek(0)
-    return file_type.decode('utf-8')
+    return maybe_decode(file_type)
 
 
 def _guess_file_type(_, filename):
     return mimetypes.guess_type(filename)[0]
 
 
+# return str on python3.  Don't want to unconditionally
+# decode because that results in unicode on python2
+def maybe_decode(s):
+    if str == bytes:
+        return s.decode('utf-8')
+    else:
+        return s
+
+
 try:
     import magic
 except ImportError: