python-bugzilla
diff --git a/‎bin/bugzilla‎
Lines changed: 1 addition & 1 deletion b/‎bin/bugzilla‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎bugzilla/base.py‎
Lines changed: 7 additions & 1 deletion b/‎bugzilla/base.py‎
Lines changed: 7 additions & 1 deletion
@@ -993,7 +993,7 @@ def _do_set_attach(bz, opt, parser, args):
         data = sys.stdin.read(4096)
 
         while data:
-            fileobj.write(data)
+            fileobj.write(data.encode(locale.getpreferredencoding()))
             data = sys.stdin.read(4096)
         fileobj.seek(0)
 
 
@@ -9,6 +9,7 @@
 # option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
 # the full text of the license.
 
+import locale
 import os
 import sys
 
@@ -1259,7 +1260,12 @@ def attachfile(self, idlist, attachfile, description, **kwargs):
             kwargs["file_name"] = kwargs.pop("filename")
 
         kwargs['summary'] = description
-        kwargs['data'] = Binary(f.read())
+
+        data = f.read()
+        if not isinstance(data, bytes):
+            data = data.encode(locale.getpreferredencoding())
+        kwargs['data'] = Binary(data)
+
         kwargs['ids'] = self._listify(idlist)
 
         if 'file_name' not in kwargs and hasattr(f, "name"):