Merge remote-tracking branch 'origin/release/5.0'

Author: cstenac

dataikuapi/utils.py

@@ -5,6 +5,8 @@
 import itertools
 
 if sys.version_info > (3,0):
+    import codecs
+
     dku_basestring_type = str
     dku_zip_longest = itertools.zip_longest
 else:
@@ -31,7 +33,7 @@ def next(self):
 
     def __iter__(self):
         return self
-        
+
 def none_if_throws(f):
     def aux(*args, **kargs):
         try:
@@ -51,7 +53,10 @@ def __init__(self, schema, csv_stream):
 
     def iter_rows(self):
         def decode(x):
-            return unicode(x, "utf8")
+            if sys.version_info > (3,0):
+                return x
+            else:
+                return unicode(x, "utf8")
 
         def parse_iso_date(s):
             if s == "":
@@ -79,9 +84,13 @@ def str_to_bool(s):
             CASTERS.get(col["type"], decode) for col in schema
         ]
         with closing(self.csv_stream) as r:
-            for uncasted_tuple in csv.reader(r.raw,
-                                         delimiter='\t',
-                                         quotechar='"',
-                                         doublequote=True):
+            if sys.version_info > (3,0):
+                raw_generator = codecs.iterdecode(r.raw, 'utf-8')
+            else:
+                raw_generator = r.raw
+            for uncasted_tuple in csv.reader(raw_generator,
+                                                delimiter='\t',
+                                                quotechar='"',
+                                                doublequote=True):
                 yield [none_if_throws(caster)(val)
-                       for (caster, val) in dku_zip_longest(casters, uncasted_tuple)]
+                        for (caster, val) in dku_zip_longest(casters, uncasted_tuple)]