Py2/Py3 compat

Author: max-sixty

pandas_gbq/gbq.py

@@ -581,7 +581,11 @@ def load_data(self, dataframe, dataset_id, table_id, chunksize):
                 self._print("\rLoad is {0}% Complete".format(
                     ((total_rows - remaining_rows) * 100) / total_rows))
 
-                body = BytesIO('{}\n'.format('\n'.join(rows)).encode('utf-8'))
+                body = '{}\n'.format('\n'.join(rows))
+                if isinstance(body, bytes):
+                    body = body.decode('utf-8')
+                body = body.encode('utf-8')
+                body = BytesIO(body)
 
                 try:
                     self.client.load_table_from_file(

pandas_gbq/tests/test_gbq.py

@@ -9,6 +9,7 @@
 import os
 from random import randint
 import logging
+import sys
 
 import numpy as np
 
@@ -1161,25 +1162,33 @@ def test_upload_chinese_unicode_data(self):
         test_size = 6
         df = DataFrame(np.random.randn(6, 4), index=range(6),
                        columns=list('ABCD'))
-        df.A = u'信用卡'
+        df['s'] = u'信用卡'
 
         gbq.to_gbq(df, self.destination_table + test_id, _get_project_id(),
                    chunksize=10000)
 
-        result = gbq.read_gbq("SELECT COUNT(*) AS num_rows FROM {0}".format(
+        result = gbq.read_gbq("SELECT * FROM {0}".format(
             self.destination_table + test_id),
             project_id=_get_project_id())
 
-        assert result['num_rows'][0] == test_size
-        tm.assert_series_equal(result['A'], df['A'])
+        assert len(result_df) == test_size
+
+        pytest.skipif(
+            sys.version_info.major < 3,
+            reason='Unicode comparison in Py2 not working')
+
+        result = result_df['s'].sort_values()
+        expected = df['s'].sort_values()
+
+        tm.assert_numpy_array_equal(expected.values, result.values)
 
     def test_upload_other_unicode_data(self):
         test_id = "3"
         test_size = 3
         df = DataFrame({
-            'string': ['Skywalker™', 'lego', 'hülle'],
-            'integer': [200, 300, 400],
-            'Date': [
+            's': ['Skywalker™', 'lego', 'hülle'],
+            'i': [200, 300, 400],
+            'd': [
                 '2017-12-13 17:40:39', '2017-12-13 17:40:39',
                 '2017-12-13 17:40:39'
             ]
@@ -1188,12 +1197,20 @@ def test_upload_other_unicode_data(self):
         gbq.to_gbq(df, self.destination_table + test_id, _get_project_id(),
                    chunksize=10000)
 
-        result = gbq.read_gbq("SELECT COUNT(*) AS num_rows FROM {0}".format(
+        result_df = gbq.read_gbq("SELECT * FROM {0}".format(
             self.destination_table + test_id),
             project_id=_get_project_id())
 
-        assert result['num_rows'][0] == test_size
-        tm.assert_series_equal(result['string'], df['string'])
+        assert len(result_df) == test_size
+
+        pytest.skipif(
+            sys.version_info.major < 3,
+            reason='Unicode comparison in Py2 not working')
+
+        result = result_df['s'].sort_values()
+        expected = df['s'].sort_values()
+
+        tm.assert_numpy_array_equal(expected.values, result.values)
 
     def test_generate_schema(self):
         df = tm.makeMixedDataFrame()
@@ -1513,25 +1530,32 @@ def test_upload_chinese_unicode_data(self):
         test_size = 6
         df = DataFrame(np.random.randn(6, 4), index=range(6),
                        columns=list('ABCD'))
-        df.A = u'信用卡'
+        df['s'] = u'信用卡'
 
         gbq.to_gbq(df, self.destination_table + test_id, _get_project_id(),
                    chunksize=10000)
 
-        result = gbq.read_gbq("SELECT COUNT(*) AS num_rows FROM {0}".format(
+        result_df = gbq.read_gbq("SELECT * FROM {0}".format(
             self.destination_table + test_id),
             project_id=_get_project_id())
 
-        assert result['num_rows'][0] == test_size
-        tm.assert_series_equal(result['A'], df['A'])
+        assert len(result_df) == test_size
+
+        if sys.version_info.major < 3:
+            pytest.skip(msg='Unicode comparison in Py2 not working')
+
+        result = result_df['s'].sort_values()
+        expected = df['s'].sort_values()
+
+        tm.assert_numpy_array_equal(expected.values, result.values)
 
     def test_upload_other_unicode_data(self):
         test_id = "3"
         test_size = 3
         df = DataFrame({
-            'string': ['Skywalker™', 'lego', 'hülle'],
-            'integer': [200, 300, 400],
-            'Date': [
+            's': ['Skywalker™', 'lego', 'hülle'],
+            'i': [200, 300, 400],
+            'd': [
                 '2017-12-13 17:40:39', '2017-12-13 17:40:39',
                 '2017-12-13 17:40:39'
             ]
@@ -1540,12 +1564,20 @@ def test_upload_other_unicode_data(self):
         gbq.to_gbq(df, self.destination_table + test_id, _get_project_id(),
                    chunksize=10000)
 
-        result = gbq.read_gbq("SELECT COUNT(*) AS num_rows FROM {0}".format(
+        result_df = gbq.read_gbq("SELECT * FROM {0}".format(
             self.destination_table + test_id),
             project_id=_get_project_id())
 
-        assert result['num_rows'][0] == test_size
-        tm.assert_series_equal(result['string'], df['string'])
+        assert len(result_df) == test_size
+
+        if sys.version_info.major < 3:
+            pytest.skip(msg='Unicode comparison in Py2 not working')
+
+        result = result_df['s'].sort_values()
+        expected = df['s'].sort_values()
+
+        tm.assert_numpy_array_equal(expected.values, result.values)
+
 
 class TestToGBQIntegrationWithServiceAccountKeyContents(object):
     # Changes to BigQuery table schema may take up to 2 minutes as of May 2015