Skip to content

Commit 49c362b

Browse files
authored
chore: remove six (from code) (#1215)
- Removed use of `six' from source (test) code and third party notice re: distributed code - However, `six` is retained in `requirements_test.txt` due to a bug in `azure-iot-hub`. This should be removed as a follow-up
1 parent 23003e8 commit 49c362b

4 files changed

Lines changed: 3 additions & 25 deletions

File tree

dev_utils/dev_utils/service_helper_sync.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# full license information.
44
import logging
55
import threading
6-
from six.moves import queue
6+
import queue
77
import copy
88
import time
99
import uuid

requirements_test.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ azure-iot-hub # Only needed for iothub e2e
99
azure-iothub-provisioningserviceclient >= 1.2.0 # Only needed for provisioning e2e
1010
azure-eventhub # Only needed for iothub e2e
1111
psutil # Only needed for iothub e2e
12-
six # Only needed for tests and should be removed ASAP a python2 backcompat should not be needed anymore.
12+
six # Needed due to a missing dependency in azure-iot-hub

tests/e2e/iothub_e2e/device_identity_helper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from azure.iot.hub import IoTHubRegistryManager
88
from base64 import b64encode, b64decode
99
from hashlib import sha256
10-
from six.moves.urllib import parse
10+
from urllib import parse
1111
from hmac import HMAC
1212

1313

thirdpartynotice.txt

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -33,28 +33,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
3333
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3434
SOFTWARE.
3535

36-
2.) License Notice for six from https://raw.githubusercontent.com/benjaminp/six/master/LICENSE
37-
-----------------------------------------------------------------------------------------------------------------------
38-
39-
Copyright (c) 2010-2019 Benjamin Peterson
40-
41-
Permission is hereby granted, free of charge, to any person obtaining a copy of
42-
this software and associated documentation files (the "Software"), to deal in
43-
the Software without restriction, including without limitation the rights to
44-
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
45-
the Software, and to permit persons to whom the Software is furnished to do so,
46-
subject to the following conditions:
47-
48-
The above copyright notice and this permission notice shall be included in all
49-
copies or substantial portions of the Software.
50-
51-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
52-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
53-
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
54-
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
55-
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
56-
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
57-
5836
3.) License Notice for paho-mqtt from https://raw.githubusercontent.com/PyCQA/astroid/master/COPYING
5937
-----------------------------------------------------------------------------------------------------------------------
6038

0 commit comments

Comments
 (0)