Merge pull request #76 from dr-rodriguez/master

Fix for unicode characters when saving tables
BDNYC · Oct 13, 2016 · ccb4ef3 · ccb4ef3
2 parents e29ace3 + c7062d8
commit ccb4ef3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/astrodbkit/__init__.py b/astrodbkit/__init__.py
@@ -1,2 +1,2 @@
 from pkg_resources import get_distribution
-__version__ = '0.6.0'
+__version__ = '0.6.1'
diff --git a/astrodbkit/astrodb.py b/astrodbkit/astrodb.py
@@ -1373,13 +1373,12 @@ def save(self, directory='tabledata'):
             tablepaths.append(tablepath)
             with open(tablepath, 'w') as f:
                 for line in self.conn.iterdump():
-                    if sys.version_info.major == 2:
-                        # line = line.decode('utf-8')
-                        line = line.encode('utf-8').decode('utf-8')
-
                     line = line.strip()
                     if line.startswith('INSERT INTO "{}"'.format(table)):
-                        f.write('%s\n' % line.encode('ascii', 'ignore'))
+                        if sys.version_info.major == 2:
+                            f.write(u'{}\n'.format(line).encode('utf-8'))
+                        else:
+                            f.write(u'{}\n'.format(line))
 
         print("Tables saved to directory {}/".format(directory))
         print("""=======================================================================================