4 files changed, 0 insertions, 121 deletions
diff --git a/net-misc/gsutil/files/dummy.boto b/net-misc/gsutil/files/dummy.boto
deleted file mode 100644
index 93e9dd2f8c77..000000000000
--- a/net-misc/gsutil/files/dummy.boto
+++ /dev/null
@@ -1,6 +0,0 @@
-# dummy .boto file for testing
-
-[Credentials]
-gs_oauth2_refresh_token = 1/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
-[GSUtil]
diff --git a/net-misc/gsutil/files/gsutil-4.41-tests.patch b/net-misc/gsutil/files/gsutil-4.41-tests.patch
deleted file mode 100644
index 9b4a0bf509ae..000000000000
--- a/net-misc/gsutil/files/gsutil-4.41-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/gslib/third_party/storage_apitools/storage_v1_client.py b/gslib/third_party/storage_apitools/storage_v1_client.py
-index b8162310..933082e9 100644
---- a/gslib/third_party/storage_apitools/storage_v1_client.py
-+++ b/gslib/third_party/storage_apitools/storage_v1_client.py
-@@ -64,8 +64,7 @@ class StorageV1(base_api.BaseApiClient):
-         log_request=log_request, log_response=log_response,
-         credentials_args=credentials_args,
-         default_global_params=default_global_params,
--        additional_http_headers=additional_http_headers,
--        response_encoding=response_encoding)
-+        additional_http_headers=additional_http_headers)
-     self._version = version
-     self.bucketAccessControls = self.BucketAccessControlsService(self)
-     self.buckets = self.BucketsService(self)
diff --git a/net-misc/gsutil/files/gsutil-4.50-boto-tests.patch b/net-misc/gsutil/files/gsutil-4.50-boto-tests.patch
deleted file mode 100644
index 5a9b601604da..000000000000
--- a/net-misc/gsutil/files/gsutil-4.50-boto-tests.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- gsutil.orig/gslib/vendored/boto/tests/integration/s3/mock_storage_service.py	2020-04-10 13:26:12.000000000 -0700
-+++ gsutil/gslib/vendored/boto/tests/integration/s3/mock_storage_service.py	2020-05-07 11:11:14.971631528 -0700
-@@ -30,13 +30,11 @@
- import boto
- import base64
- import re
--import six
- from hashlib import md5
-
- from boto.utils import compute_md5
- from boto.utils import find_matching_headers
- from boto.utils import merge_headers_by_name
--from boto.utils import write_to_fd
- from boto.s3.prefix import Prefix
--from boto.compat import six
-+import six
-
-@@ -90,14 +88,12 @@
-                              torrent=NOT_IMPL,
-                              version_id=NOT_IMPL,
-                              res_download_handler=NOT_IMPL):
--        data = six.ensure_binary(self.data)
--        write_to_fd(fp, data)
-+        fp.write(six.ensure_str(self.data, errors='replace'))
-
-     def get_file(self, fp, headers=NOT_IMPL, cb=NOT_IMPL, num_cb=NOT_IMPL,
-                  torrent=NOT_IMPL, version_id=NOT_IMPL,
-                  override_num_retries=NOT_IMPL):
--        data = six.ensure_binary(self.data)
--        write_to_fd(fp, data)
-+        fp.write(self.data)
-
-     def _handle_headers(self, headers):
-         if not headers:
-@@ -284,9 +280,6 @@
-         else:
-             return '<Subresource/>'
-
--    def get_tags(self):
--      return []
--
-     def new_key(self, key_name=None):
-         mock_key = MockKey(self, key_name)
-         self.keys[key_name] = mock_key
diff --git a/net-misc/gsutil/files/gsutil-4.50-tests.patch b/net-misc/gsutil/files/gsutil-4.50-tests.patch
deleted file mode 100644
index 757f1f4ed4d5..000000000000
--- a/net-misc/gsutil/files/gsutil-4.50-tests.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/gslib/boto_translation.py b/gslib/boto_translation.py
-index 0af2e663..7d2f549f 100644
---- a/gslib/boto_translation.py
-+++ b/gslib/boto_translation.py
-@@ -1457,7 +1457,8 @@ class BotoTranslation(CloudApi):
-         # TODO: Define tags-related methods on storage_uri objects. In the
-         # meantime, we invoke the underlying bucket's methods directly.
-         try:
--          boto_tags = bucket_uri.get_bucket().get_tags()
-+          bucket = bucket_uri.get_bucket()
-+          boto_tags = bucket.get_tags() if hasattr(bucket, 'get_tags') else []
-           cloud_api_bucket.labels = (
-               LabelTranslation.BotoTagsToMessage(boto_tags))
-         except boto.exception.StorageResponseError as e:
-diff --git a/gslib/tests/test_naming.py b/gslib/tests/test_naming.py
-index d91cda04..6b44719f 100644
---- a/gslib/tests/test_naming.py
-+++ b/gslib/tests/test_naming.py
-@@ -36,6 +36,7 @@ from __future__ import unicode_literals
- 
- import gzip
- import os
-+import unittest 
- 
- import six
- 
-@@ -504,6 +505,7 @@ class GsutilNamingTests(testcase.GsUtilUnitTestCase):
-     self.assertEqual(1, len(actual))
-     self.assertEqual('/obj', actual[0].root_object.name)
- 
-+  @unittest.skip('test appears to be flakey')
-   def testCopyingCompressedFileToBucket(self):
-     """Tests copying one file with compression to a bucket."""
-     src_file = self.CreateTempFile(contents=b'plaintext', file_name='f2.txt')
-diff --git a/gslib/tests/testcase/unit_testcase.py b/gslib/tests/testcase/unit_testcase.py
-index b25352b6..c958f670 100644
---- a/gslib/tests/testcase/unit_testcase.py
-+++ b/gslib/tests/testcase/unit_testcase.py
-@@ -27,7 +27,6 @@ import tempfile
- import six
- 
- import boto
--from boto.utils import get_utf8able_str
- from gslib import project_id
- from gslib import wildcard_iterator
- from gslib.boto_translation import BotoTranslation
-@@ -157,8 +156,8 @@ class GsUtilUnitTestCase(base.GsUtilTestCase):
-         stderr = sys.stderr.buffer.read()
-     [six.ensure_text(string) for string in self.accumulated_stderr]
-     [six.ensure_text(string) for string in self.accumulated_stdout]
--    stdout = six.ensure_text(get_utf8able_str(stdout))
--    stderr = six.ensure_text(get_utf8able_str(stderr))
-+    stdout = six.ensure_text(six.ensure_str(stdout))
-+    stderr = six.ensure_text(six.ensure_str(stderr))
-     stdout += ''.join(self.accumulated_stdout)
-     stderr += ''.join(self.accumulated_stderr)
-     _AttemptToCloseSysFd(sys.stdout)