Remove six as a dependency (closes #435)

This completes the work to deprecate Python 2.x that began with #430
(closes #409).

Author: natanlao

hca/upload/upload_area_uri.py

@@ -1,4 +1,5 @@
-from six.moves.urllib.parse import urlparse
+# -*- coding: utf-8 -*-
+import urllib.parse
 
 
 class UploadAreaURI:
@@ -11,7 +12,7 @@ class UploadAreaURI:
 
     def __init__(self, uri):
         self.uri = uri
-        self.parsed = urlparse(self.uri)
+        self.parsed = urllib.parse.urlparse(self.uri)
 
     def __str__(self):
         return self.uri

requirements.txt

@@ -17,6 +17,5 @@ PyJWT >= 1.6.4
 requests >= 2.20.0, < 3
 rsa<=3.5.0,>=3.1.2
 s3transfer<0.3.0,>=0.2.0
-six >= 1.10, < 2
 tenacity >=5.0.2, < 5.1
 tweak >= 1.0.2, < 2

test/integration/upload/cli/test_creds.py

@@ -7,7 +7,6 @@
 from argparse import Namespace
 
 import responses
-import six
 
 pkg_root = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', '..', '..'))  # noqa
 sys.path.insert(0, pkg_root)  # noqa
@@ -30,9 +29,9 @@ def test_creds(self):
 
         non_blank_lines = [s for s in stdout.captured().split("\n") if s]
         self.assertEqual(3, len(non_blank_lines))
-        six.assertRegex(self, stdout.captured(), "AWS_ACCESS_KEY_ID=")
-        six.assertRegex(self, stdout.captured(), "AWS_SECRET_ACCESS_KEY=")
-        six.assertRegex(self, stdout.captured(), "AWS_SESSION_TOKEN=")
+        self.assertRegex(stdout.captured(), "AWS_ACCESS_KEY_ID=")
+        self.assertRegex(stdout.captured(), "AWS_SECRET_ACCESS_KEY=")
+        self.assertRegex(stdout.captured(), "AWS_SESSION_TOKEN=")
 
 
 if __name__ == "__main__":

test/integration/upload/cli/test_forget.py

@@ -6,8 +6,6 @@
 import unittest
 from argparse import Namespace
 
-import six
-
 pkg_root = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "..", ".."))  # noqa
 sys.path.insert(0, pkg_root)  # noqa
 
@@ -38,7 +36,7 @@ def test_when_given_an_alias_that_matches_no_areas_it_prints_a_warning(self):
                 args = Namespace(uuid_or_alias='bogo-uuid')
                 ForgetCommand(args)
 
-        six.assertRegex(self, stdout.captured(), "don't recognize area")
+        self.assertRegex(stdout.captured(), "don't recognize area")
 
     def test_when_given_an_alias_that_matches_more_than_one_area_it_prints_a_warning(self):
         self.mock_upload_area('deadbeef-dead-dead-dead-beeeeeeeeeef')
@@ -49,7 +47,7 @@ def test_when_given_an_alias_that_matches_more_than_one_area_it_prints_a_warning
                 args = Namespace(uuid_or_alias='dea')
                 ForgetCommand(args)
 
-        six.assertRegex(self, stdout.captured(), "matches more than one")
+        self.assertRegex(stdout.captured(), "matches more than one")
 
 
 if __name__ == "__main__":

test/integration/upload/cli/test_list_area.py

@@ -7,7 +7,6 @@
 import unittest
 
 import responses
-import six
 
 pkg_root = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "..", ".."))  # noqa
 sys.path.insert(0, pkg_root)  # noqa
@@ -57,9 +56,9 @@ def test_list_area_command_with_long_option(self):
         with CapturingIO('stdout') as stdout:
             ListAreaCommand(Namespace(long=True))
 
-        six.assertRegex(self, stdout.captured(), "size\s+123")
-        six.assertRegex(self, stdout.captured(), "Content-Type\s+binary/octet-stream; dcp-type=data")
-        six.assertRegex(self, stdout.captured(), "SHA1\s+shaaa")
+        self.assertRegex(stdout.captured(), "size\s+123")
+        self.assertRegex(stdout.captured(), "Content-Type\s+binary/octet-stream; dcp-type=data")
+        self.assertRegex(stdout.captured(), "SHA1\s+shaaa")
 
 
 if __name__ == "__main__":

test/integration/upload/cli/test_list_areas.py

@@ -6,8 +6,6 @@
 import unittest
 from argparse import Namespace
 
-import six
-
 pkg_root = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', '..', '..'))  # noqa
 sys.path.insert(0, pkg_root)  # noqa
 
@@ -34,8 +32,8 @@ def test_it_lists_areas_when_there_are_some(self):
         with CapturingIO('stdout') as stdout:
             ListAreasCommand(Namespace())
 
-        six.assertRegex(self, stdout.captured(), "%s <- selected" % a_uuid)
-        six.assertRegex(self, stdout.captured(), b_uuid)
+        self.assertRegex(stdout.captured(), "%s <- selected" % a_uuid)
+        self.assertRegex(stdout.captured(), b_uuid)
 
 
 if __name__ == "__main__":

test/integration/upload/cli/test_select.py

@@ -7,8 +7,6 @@
 import unittest
 from argparse import Namespace
 
-import six
-
 pkg_root = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "..", ".."))  # noqa
 sys.path.insert(0, pkg_root)  # noqa
 
@@ -63,7 +61,7 @@ def test_when_given_a_uri_it_prints_an_alias(self):
             args = Namespace(uri_or_alias=new_area_uri)
             SelectCommand(args)
 
-        six.assertRegex(self, stdout.captured(), "alias \"{}\"".format('deaf'))
+        self.assertRegex(stdout.captured(), "alias \"{}\"".format('deaf'))
 
     def test_when_given_an_alias_that_matches_no_areas_it_prints_a_warning(self):
 
@@ -75,7 +73,7 @@ def test_when_given_an_alias_that_matches_no_areas_it_prints_a_warning(self):
             args = Namespace(uri_or_alias='aaa')
             SelectCommand(args)
 
-        six.assertRegex(self, stdout.captured(), "don't recognize area")
+        self.assertRegex(stdout.captured(), "don't recognize area")
 
     def test_when_given_an_alias_that_matches_more_than_one_area_it_prints_a_warning(self):
         config = hca.get_config()
@@ -91,7 +89,7 @@ def test_when_given_an_alias_that_matches_more_than_one_area_it_prints_a_warning
             args = Namespace(uri_or_alias='dea')
             SelectCommand(args)
 
-        six.assertRegex(self, stdout.captured(), "matches more than one")
+        self.assertRegex(stdout.captured(), "matches more than one")
 
     def test_when_given_an_alias_that_matches_one_area_it_selects_it(self):
         a_uuid = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'

test/unit/test_dss_client.py

@@ -4,12 +4,10 @@
 import os
 import platform
 import shutil
-import sys
 import tempfile
 import threading
 import unittest
 import uuid
-import six
 
 from mock import patch
 from hca.util.compat import walk
@@ -82,9 +80,9 @@ def _fake_do_download_file_with_barrier(*args, **kwargs):
     """
     barrier.wait()
     fh = args[1]
-    fh.write(six.b('Here we write some stuff so that the fake download takes some time. '
-                   'This helps ensure that multiple threads are writing at once and thus '
-                   'allows us to test for race conditions.'))
+    fh.write(b'Here we write some stuff so that the fake download takes some time. '
+             b'This helps ensure that multiple threads are writing at once and thus '
+             b'allows us to test for race conditions.')
     return 'FAKEhash'