reverted import/exporet change that breaks python 3

web2py · Aug 6, 2018 · 70929a6 · 70929a6
1 parent 6185a34
commit 70929a6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pydal/base.py b/pydal/base.py
@@ -860,7 +860,7 @@ def import_from_csv_file(self, ifile, id_map=None, null='<NULL>',
         id_offset = {} # only used if id_map is None
         map_tablenames = map_tablenames or {}
         for line in ifile:
-            line = line.decode().strip()
+            line = line.strip()
             if not line:
                 continue
             elif line == 'END':

diff --git a/pydal/objects.py b/pydal/objects.py
@@ -924,8 +924,8 @@ def import_from_csv_file(self,
         if restore:
             self._db[self].truncate()
 
-        csvfile = csvfile.read().decode()
-        reader = csv.reader(csvfile, delimiter=delimiter,quotechar=quotechar, quoting=quoting)
+        reader = csv.reader(csvfile, delimiter=delimiter,
+                            quotechar=quotechar, quoting=quoting)
         colnames = None
         if isinstance(id_map, dict):
             if self._tablename not in id_map: