Merge "Remove six.PY3"

4 files changed, 5 insertions, 14 deletions

diff --git a/trove/dns/designate/driver.py b/trove/dns/designate/driver.py
index d25859a3..7747d1f0 100644
--- a/trove/dns/designate/driver.py
+++ b/trove/dns/designate/driver.py
@@ -25,7 +25,6 @@ from keystoneauth1 import loading
 from keystoneauth1 import session
 from oslo_log import log as logging
 from oslo_utils import encodeutils
-import six
 
 from trove.common import cfg
 from trove.common import exception
@@ -110,8 +109,7 @@ class DesignateInstanceEntryFactory(driver.DnsInstanceEntryFactory):
         name = encodeutils.to_utf8(instance_id)
         name = hashlib.md5(name).digest()
         name = base64.b32encode(name)[:11].lower()
-        if six.PY3:
-            name = name.decode('ascii')
+        name = name.decode('ascii')
         hostname = ("%s.%s" % (name, zone.name))
         # Removing the leading dot if present
         if hostname.endswith('.'):
diff --git a/trove/tests/fakes/swift.py b/trove/tests/fakes/swift.py
index 379aa8ff..7b8da07a 100644
--- a/trove/tests/fakes/swift.py
+++ b/trove/tests/fakes/swift.py
@@ -108,10 +108,7 @@ class FakeSwiftConnection(object):
                 object_checksum = md5(self.container_objects[object_name])
                 # The manifest file etag for a HEAD or GET is the checksum of
                 # the concatenated checksums.
-                if six.PY3:
-                    checksum.update(object_checksum.hexdigest().encode())
-                else:
-                    checksum.update(object_checksum.hexdigest())
+                checksum.update(object_checksum.hexdigest().encode())
             # this is included to test bad swift segment etags
             if name.startswith("bad_manifest_etag_"):
                 return {'etag': '"this_is_an_intentional_bad_manifest_etag"'}
diff --git a/trove/tests/unittests/api/common/test_limits.py b/trove/tests/unittests/api/common/test_limits.py
index 2cf3be08..7d8ee340 100644
--- a/trove/tests/unittests/api/common/test_limits.py
+++ b/trove/tests/unittests/api/common/test_limits.py
@@ -600,8 +600,7 @@ class FakeHttplibConnection(object):
 
         resp = str(req.get_response(self.app))
         resp = "HTTP/1.0 %s" % resp
-        if six.PY3:
-            resp = resp.encode("utf-8")
+        resp = resp.encode("utf-8")
         sock = FakeHttplibSocket(resp)
         self.http_response = http_client.HTTPResponse(sock)
         self.http_response.begin()
diff --git a/trove/tests/unittests/domain-name-service/test_designate_driver.py b/trove/tests/unittests/domain-name-service/test_designate_driver.py
index 7a464e0b..4b07de9c 100644
--- a/trove/tests/unittests/domain-name-service/test_designate_driver.py
+++ b/trove/tests/unittests/domain-name-service/test_designate_driver.py
@@ -16,7 +16,6 @@ import hashlib
 
 from unittest.mock import MagicMock
 from unittest.mock import patch
-import six
 
 from trove.common import exception
 from trove.dns.designate import driver
@@ -89,8 +88,7 @@ class DesignateInstanceEntryFactoryTest(trove_testtools.TestCase):
         driver.DNS_TTL = 3600
         hashed_id = hashlib.md5(instance_id.encode()).digest()
         hashed_id = base64.b32encode(hashed_id)
-        if six.PY3:
-            hashed_id = hashed_id.decode('ascii')
+        hashed_id = hashed_id.decode('ascii')
         hashed_id_concat = hashed_id[:11].lower()
         exp_hostname = ("%s.%s" % (hashed_id_concat, driver.DNS_DOMAIN_NAME))
         factory = driver.DesignateInstanceEntryFactory()
@@ -109,8 +107,7 @@ class DesignateInstanceEntryFactoryTest(trove_testtools.TestCase):
         driver.DNS_TTL = 3600
         hashed_id = hashlib.md5(instance_id.encode()).digest()
         hashed_id = base64.b32encode(hashed_id)
-        if six.PY3:
-            hashed_id = hashed_id.decode('ascii')
+        hashed_id = hashed_id.decode('ascii')
         hashed_id_concat = hashed_id[:11].lower()
         exp_hostname = ("%s.%s" %
                         (hashed_id_concat, driver.DNS_DOMAIN_NAME))[:-1]