[AIRFLOW-3419] Fix S3Hook.select_key on Python3 (#4970)

apache · Mar 27, 2019 · 8eaaec6 · 8eaaec6
1 parent 74155f5
commit 8eaaec6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/airflow/hooks/S3_hook.py b/airflow/hooks/S3_hook.py
@@ -272,7 +272,7 @@ def select_key(self, key, bucket_name=None,
             InputSerialization=input_serialization,
             OutputSerialization=output_serialization)
 
-        return ''.join(event['Records']['Payload']
+        return ''.join(event['Records']['Payload'].decode('utf-8')
                        for event in response['Payload']
                        if 'Records' in event)
 

diff --git a/tests/hooks/test_s3_hook.py b/tests/hooks/test_s3_hook.py
@@ -211,7 +211,7 @@ def test_read_key(self):
     @mock.patch('airflow.contrib.hooks.aws_hook.AwsHook.get_client_type')
     def test_select_key(self, mock_get_client_type):
         mock_get_client_type.return_value.select_object_content.return_value = \
-            {'Payload': [{'Records': {'Payload': u'Contént'}}]}
+            {'Payload': [{'Records': {'Payload': b'Cont\xC3\xA9nt'}}]}
         hook = S3Hook(aws_conn_id=None)
         self.assertEqual(hook.select_key('my_key', 'mybucket'), u'Contént')