Skip to content

Commit 1898e4a

Browse files
committed
finish removing "six"
Hi, I've been busy doing this for two years. It looks like the very end of it here. https://wiki.debian.org/Python3-six-removal (beware: on Debian, six watc patch-out of dateutil already)
1 parent bc15429 commit 1898e4a

File tree

5 files changed

+2
-7
lines changed

5 files changed

+2
-7
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2335,7 +2335,6 @@ def load_arguments(self, _): # pylint: disable=too-many-locals, too-many-statem
23352335
c.argument('expiry', type=get_datetime_type(True), help='expiration UTC datetime in (Y-m-d\'T\'H:M:S\'Z\')')
23362336
c.ignore('auth_mode')
23372337

2338-
from six import u as unicode_string
23392338
for item in ['get', 'peek', 'put', 'update', 'delete', 'clear']:
23402339
with self.argument_context('storage message {}'.format(item)) as c:
23412340
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
23502349
'the :func:`~get_messages` or :func:`~update_message` operation.')
23512350

23522351
with self.argument_context('storage message put') as c:
2353-
c.argument('content', type=unicode_string, help='Message content, up to 64KB in size.')
2352+
c.argument('content', type=str, help='Message content, up to 64KB in size.')
23542353
c.extra('time_to_live', type=int,
23552354
help='Specify the time-to-live interval for the message, in seconds. '
23562355
'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
23782377
'a maximum of 32. By default, a single message is peeked from the queue with this operation.')
23792378

23802379
with self.argument_context('storage message update') as c:
2381-
c.argument('content', type=unicode_string, help='Message content, up to 64KB in size.')
2380+
c.argument('content', type=str, help='Message content, up to 64KB in size.')
23822381
c.extra('visibility_timeout', type=int,
23832382
help='If not specified, the default value is 0. Specify the new visibility timeout value, in seconds, '
23842383
'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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ requests-oauthlib==1.2.0
126126
requests==2.32.4
127127
scp==0.13.2
128128
semver==3.0.4
129-
six==1.16.0
130129
sshtunnel==0.1.5
131130
tabulate==0.8.9
132131
urllib3==2.5.0

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ requests-oauthlib==1.2.0
127127
requests==2.32.4
128128
scp==0.13.2
129129
semver==3.0.4
130-
six==1.16.0
131130
sshtunnel==0.1.5
132131
tabulate==0.8.9
133132
urllib3==2.5.0

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ requests-oauthlib==1.2.0
128128
requests==2.32.4
129129
scp==0.13.2
130130
semver==3.0.4
131-
six==1.16.0
132131
sshtunnel==0.1.5
133132
tabulate==0.8.9
134133
urllib3==2.5.0

src/azure-cli/setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@
148148
'scp~=0.13.2',
149149
'semver~=3.0',
150150
'setuptools',
151-
'six>=1.10.0', # six is still used by countless extensions
152151
'sshtunnel~=0.1.4',
153152
# Even though knack already depends on tabulate, profile module directly uses it for interactive subscription
154153
# selection

0 commit comments

Comments
 (0)