فهرست منبع

[raz] Change content to sign type to bytes from str for Py3 S3 file browser (#3116)

Harsh Gupta 3 سال پیش
والد
کامیت
78710616bc
2فایلهای تغییر یافته به همراه5 افزوده شده و 4 حذف شده
  1. 2 2
      desktop/libs/aws/src/aws/s3/s3connection.py
  2. 3 2
      desktop/libs/aws/src/aws/s3/s3connection_test.py

+ 2 - 2
desktop/libs/aws/src/aws/s3/s3connection.py

@@ -98,7 +98,7 @@ class RazS3Connection(SignedUrlS3Connection):
     3. return self._mexe(requests)
   """
 
-  def make_request(self, method, bucket='', key='', headers=None, data='',
+  def make_request(self, method, bucket='', key='', headers=None, data=b'',
                     query_args=None, sender=None, override_num_retries=None,
                     retry_handler=None):
 
@@ -139,7 +139,7 @@ class RazS3Connection(SignedUrlS3Connection):
     url = 'https://%(host)s%(path)s' % {'host': host, 'path': path}
 
     # Do not send the xml data for signing for upload operation
-    xml_data = '' if query_args and 'uploadId=' in query_args else data
+    xml_data = b'' if query_args and 'uploadId=' in query_args else data
 
     raz_headers = self.get_signed_url(action=method, url=url, headers=headers, data=xml_data)
     LOG.debug('Raz returned those headers: %s' % raz_headers)

+ 3 - 2
desktop/libs/aws/src/aws/s3/s3connection_test.py

@@ -85,7 +85,7 @@ class TestRazS3Connection():
           http_request.headers
         )
         assert_equal({}, http_request.params)
-        assert_equal('', http_request.body)
+        assert_equal(b'', http_request.body)
 
 
 class TestSelfSignedUrlS3Connection():
@@ -204,7 +204,8 @@ class TestSelfSignedUrlClientIntegration(S3TestBase):
     kwargs = {'action': 'GET', 'bucket': 'gethue-test', 'key': 'data/query-hive-weblogs.csv'}
     url = SelfSignedUrlClient(self.connection).generate_url(**kwargs)
 
-    url = 'https://gethue-test.s3.amazonaws.com/data/query-hive-weblogs.csv?AWSAccessKeyId=AKIA23E77ZX2HVY76YGL&Signature=3lhK%2BwtQ9Q2u5VDIqb4MEpoY3X4%3D&Expires=1617207304'
+    url = 'https://gethue-test.s3.amazonaws.com/data/query-hive-weblogs.csv?'
+    'AWSAccessKeyId=AKIA23E77ZX2HVY76YGL&Signature=3lhK%2BwtQ9Q2u5VDIqb4MEpoY3X4%3D&Expires=1617207304'
 
     assert_true('data/query-hive-weblogs.csv' in url)
     assert_true('AWSAccessKeyId=' in url)