Remove all usage of six library

Replace six with Python 3 style code.

Change-Id: I3d0c35e237484409d8410601ec482fac0dacf30d

4 files changed, 8 insertions, 15 deletions

diff --git a/oslo_policy/tests/base.py b/oslo_policy/tests/base.py
index 670ef4b..698e4dd 100644
--- a/oslo_policy/tests/base.py
+++ b/oslo_policy/tests/base.py
@@ -14,6 +14,7 @@
 #    under the License.
 
 import codecs
+import io
 import os
 import os.path
 import sys
@@ -21,7 +22,6 @@ import sys
 import fixtures
 from oslo_config import fixture as config
 from oslotest import base as test_base
-from six import moves
 
 from oslo_policy import _checks
 from oslo_policy import policy
@@ -55,7 +55,7 @@ class PolicyBaseTestCase(test_base.BaseTestCase):
             f.write(contents)
 
     def _capture_stdout(self):
-        self.useFixture(fixtures.MonkeyPatch('sys.stdout', moves.StringIO()))
+        self.useFixture(fixtures.MonkeyPatch('sys.stdout', io.StringIO()))
         return sys.stdout
 
 
diff --git a/oslo_policy/tests/test_external.py b/oslo_policy/tests/test_external.py
index 80fdec8..478920b 100644
--- a/oslo_policy/tests/test_external.py
+++ b/oslo_policy/tests/test_external.py
@@ -18,7 +18,7 @@ from unittest import mock
 
 from oslo_serialization import jsonutils
 from requests_mock.contrib import fixture as rm_fixture
-import six.moves.urllib.parse as urlparse
+from urllib import parse as urlparse
 
 from oslo_policy import _external
 from oslo_policy import opts
diff --git a/oslo_policy/tests/test_parser.py b/oslo_policy/tests/test_parser.py
index f1ac36b..3ca73b4 100644
--- a/oslo_policy/tests/test_parser.py
+++ b/oslo_policy/tests/test_parser.py
@@ -16,7 +16,6 @@
 from unittest import mock
 
 from oslotest import base as test_base
-import six
 
 from oslo_policy import _checks
 from oslo_policy import _parser
@@ -173,8 +172,7 @@ class ParseStateMetaTestCase(test_base.BaseTestCase):
         self.assertEqual([['d', 'e', 'f'], ['a', 'b', 'c']], spam.reducers)
 
     def test_parse_state_meta(self):
-        @six.add_metaclass(_parser.ParseStateMeta)
-        class FakeState(object):
+        class FakeState(metaclass=_parser.ParseStateMeta):
 
             @_parser.reducer('a', 'b', 'c')
             @_parser.reducer('d', 'e', 'f')
diff --git a/oslo_policy/tests/test_policy.py b/oslo_policy/tests/test_policy.py
index 7b05362..d9f6fa0 100644
--- a/oslo_policy/tests/test_policy.py
+++ b/oslo_policy/tests/test_policy.py
@@ -23,7 +23,6 @@ from oslo_config import cfg
 from oslo_context import context
 from oslo_serialization import jsonutils
 from oslotest import base as test_base
-import six
 
 from oslo_policy import _cache_handler
 from oslo_policy import _checks
@@ -349,8 +348,7 @@ class EnforcerTest(base.PolicyBaseTestCase):
         self.enforcer.load_rules(False)
         self.assertIsNotNone(self.enforcer.rules)
 
-        old = six.next(six.itervalues(
-            self.enforcer._policy_dir_mtimes))
+        old = next(iter(self.enforcer._policy_dir_mtimes))
         self.assertEqual(1, len(self.enforcer._policy_dir_mtimes))
 
         # Touch the file
@@ -361,8 +359,7 @@ class EnforcerTest(base.PolicyBaseTestCase):
 
         self.enforcer.load_rules(False)
         self.assertEqual(1, len(self.enforcer._policy_dir_mtimes))
-        self.assertEqual(old, six.next(six.itervalues(
-            self.enforcer._policy_dir_mtimes)))
+        self.assertEqual(old, next(iter(self.enforcer._policy_dir_mtimes)))
 
         loaded_rules = jsonutils.loads(str(self.enforcer.rules))
         self.assertEqual('is_admin:True', loaded_rules['admin'])
@@ -385,14 +382,12 @@ class EnforcerTest(base.PolicyBaseTestCase):
         self.enforcer.load_rules(False)
         self.assertIsNotNone(self.enforcer.rules)
 
-        old = six.next(six.itervalues(
-            self.enforcer._policy_dir_mtimes))
+        old = next(iter(self.enforcer._policy_dir_mtimes))
         self.assertEqual(1, len(self.enforcer._policy_dir_mtimes))
 
         self.enforcer.load_rules(False)
         self.assertEqual(1, len(self.enforcer._policy_dir_mtimes))
-        self.assertEqual(old, six.next(six.itervalues(
-            self.enforcer._policy_dir_mtimes)))
+        self.assertEqual(old, next(iter(self.enforcer._policy_dir_mtimes)))
 
         loaded_rules = jsonutils.loads(str(self.enforcer.rules))
         self.assertEqual('is_admin:True', loaded_rules['admin'])