[Chore] finish removing "six"

src/azure-cli/azure/cli/command_modules/storage/_params.py

@@ -2335,7 +2335,6 @@ def load_arguments(self, _):  # pylint: disable=too-many-locals, too-many-statem
         c.argument('expiry', type=get_datetime_type(True), help='expiration UTC datetime in (Y-m-d\'T\'H:M:S\'Z\')')
         c.ignore('auth_mode')
 
-    from six import u as unicode_string
     for item in ['get', 'peek', 'put', 'update', 'delete', 'clear']:
         with self.argument_context('storage message {}'.format(item)) as c:
             c.extra('queue_name', queue_name_type, required=True)
@@ -2350,7 +2349,7 @@ def load_arguments(self, _):  # pylint: disable=too-many-locals, too-many-statem
                             'the :func:`~get_messages` or :func:`~update_message` operation.')
 
     with self.argument_context('storage message put') as c:
-        c.argument('content', type=unicode_string, help='Message content, up to 64KB in size.')
+        c.argument('content', type=str, help='Message content, up to 64KB in size.')
         c.extra('time_to_live', type=int,
                 help='Specify the time-to-live interval for the message, in seconds. '
                      'The time-to-live may be any positive number or -1 for infinity. '
@@ -2378,7 +2377,7 @@ def load_arguments(self, _):  # pylint: disable=too-many-locals, too-many-statem
                      'a maximum of 32. By default, a single message is peeked from the queue with this operation.')
 
     with self.argument_context('storage message update') as c:
-        c.argument('content', type=unicode_string, help='Message content, up to 64KB in size.')
+        c.argument('content', type=str, help='Message content, up to 64KB in size.')
         c.extra('visibility_timeout', type=int,
                 help='If not specified, the default value is 0. Specify the new visibility timeout value, in seconds, '
                      'relative to server time. The new value must be larger than or equal to 0, and cannot be larger '

src/azure-cli/requirements.py3.Darwin.txt

@@ -126,7 +126,6 @@ requests-oauthlib==1.2.0
 requests==2.32.4
 scp==0.13.2
 semver==3.0.4
-six==1.16.0
 sshtunnel==0.1.5
 tabulate==0.8.9
 urllib3==2.5.0

src/azure-cli/requirements.py3.Linux.txt

@@ -127,7 +127,6 @@ requests-oauthlib==1.2.0
 requests==2.32.4
 scp==0.13.2
 semver==3.0.4
-six==1.16.0
 sshtunnel==0.1.5
 tabulate==0.8.9
 urllib3==2.5.0

src/azure-cli/requirements.py3.windows.txt

@@ -128,7 +128,6 @@ requests-oauthlib==1.2.0
 requests==2.32.4
 scp==0.13.2
 semver==3.0.4
-six==1.16.0
 sshtunnel==0.1.5
 tabulate==0.8.9
 urllib3==2.5.0

src/azure-cli/setup.py

@@ -148,7 +148,6 @@
     'scp~=0.13.2',
     'semver~=3.0',
     'setuptools',
-    'six>=1.10.0',  # six is still used by countless extensions
     'sshtunnel~=0.1.4',
     # Even though knack already depends on tabulate, profile module directly uses it for interactive subscription
     # selection