Fix strings encoding (Closes #6)

Gauvain Pocentek · Gauvain Pocentek · commit 64cead6d48f8 · 2013-09-14T08:49:49.000+02:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+Version 0.4
+
+ * Fix strings encoding (Closes #6)
+
 Version 0.3
 
  * Use PRIVATE-TOKEN header for passing the auth token
diff --git a/gitlab.py b/gitlab.py
@@ -18,6 +18,7 @@
 
 import json
 import requests
+import sys
 
 __title__ = 'python-gitlab'
 __version__ = '0.3'
@@ -298,8 +299,10 @@ def update(self, obj):
         # build a dict of data that can really be sent to server
         d = {}
         for k, v in obj.__dict__.items():
-            if type(v) in (int, str, unicode, bool):
+            if type(v) in (int, str, bool):
                 d[k] = str(v)
+            elif type(v) == unicode:
+                d[k] = str(v.encode(sys.stdout.encoding, "replace"))
 
         try:
             r = requests.put(url, d, headers=self.headers, verify=self.ssl_verify)
@@ -520,6 +523,8 @@ def _obj_to_str(obj):
         elif isinstance(obj, list):
             s = ", ".join([GitlabObject._obj_to_str(x) for x in obj])
             return "[ %s ]" %s
+        elif isinstance(obj, unicode):
+            return obj.encode(sys.stdout.encoding, "replace")
         else:
             return str(obj)
 
@@ -530,7 +535,7 @@ def pretty_print(self, depth=0):
             if k == self.idAttr:
                 continue
             v = self.__dict__[k]
-            pretty_k = k.replace('_', '-')
+            pretty_k = k.replace('_', '-').encode(sys.stdout.encoding, "replace")
             if isinstance(v, GitlabObject):
                 if depth == 0:
                     print("%s:" % pretty_k)
