Merge pull request #85 from scraperwiki/fix-bytes

Fix broken strings on Python 2.7

Author: drj11

scraperwiki/sql.py

@@ -35,9 +35,12 @@ class Blob(bytes):
     datetime.datetime: sqlalchemy.types.DateTime,
 
     Blob: sqlalchemy.types.LargeBinary,
-    bytes: sqlalchemy.types.LargeBinary,
 }
 
+if bytes is not str:
+    # On 2.7, bytes *is* str, so we don't want to overwrite that.
+    PYTHON_SQLITE_TYPE_MAP[bytes] = sqlalchemy.types.LargeBinary
+
 try:
     PYTHON_SQLITE_TYPE_MAP[long] = sqlalchemy.types.BigInteger
 except NameError:

tests.py

@@ -2,6 +2,7 @@
 from __future__ import absolute_import
 
 import datetime
+import json
 import os
 import re
 import shutil
@@ -195,7 +196,7 @@ def test_add_column(self):
 
         script = dedent(u"""
           import scraperwiki
-          scraperwiki.sql.save(['id'], dict(id=1, a="bar\xaa", b="foo\xaa"))
+          scraperwiki.sql.save(['id'], dict(id=1, a=u"bar\xaa", b=u"foo\xaa"))
           """)
         with open("/dev/null") as null:
             process = Popen([sys.executable, "-c", script],
@@ -218,6 +219,12 @@ def test_save_string(self):
                 (u'LeTourneau\u1234',)]
         )
 
+        # Ensure we can round-trip a string and then json encode it.
+        # https://github.com/scraperwiki/scraperwiki-python/pull/85
+        scraperwiki.sql.save([], {"test": "teststring"}, table_name="teststring")
+        data = scraperwiki.sql.select("* FROM teststring")
+        json.dumps(data)
+
     def test_save_twice(self):
         self.save_and_check(
             {u"modelNumber\xaa": 293}, u"modelNumbers", [(293,)]