Do not use the six library.

Change-Id: I3dbfcfa0f5f590a41ed549afd44537d8ed41433a

glanceclient/tests/unit/test_shell.py

@@ -160,27 +160,6 @@ class ShellTest(testutils.TestCase):
             sys.stderr = orig_stderr
         return (stdout, stderr)
 
-    def test_fixup_subcommand(self):
-        arglist = [u'image-list', u'--help']
-        expected_arglist = [u'image-list', u'--help']
-
-        openstack_shell.OpenStackImagesShell._fixup_subcommand(
-            arglist, arglist
-        )
-        self.assertEqual(expected_arglist, arglist)
-
-    def test_fixup_subcommand_with_options_preceding(self):
-        arglist = [u'--os-auth-token', u'abcdef', u'image-list', u'--help']
-        unknown = arglist[2:]
-        expected_arglist = [
-            u'--os-auth-token', u'abcdef', u'image-list', u'--help'
-        ]
-
-        openstack_shell.OpenStackImagesShell._fixup_subcommand(
-            unknown, arglist
-        )
-        self.assertEqual(expected_arglist, arglist)
-
     def test_help_unknown_command(self):
         shell = openstack_shell.OpenStackImagesShell()
         argstr = '--os-image-api-version 2 help foofoo'