diff --git a/dev_utils/dev_utils/service_helper_sync.py b/dev_utils/dev_utils/service_helper_sync.py index c35c33233..ca21cffdb 100644 --- a/dev_utils/dev_utils/service_helper_sync.py +++ b/dev_utils/dev_utils/service_helper_sync.py @@ -3,7 +3,7 @@ # full license information. import logging import threading -from six.moves import queue +import queue import copy import time import uuid diff --git a/requirements_test.txt b/requirements_test.txt index c5483b397..a6cc550c4 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -8,5 +8,4 @@ flake8 azure-iot-hub # Only needed for iothub e2e azure-iothub-provisioningserviceclient >= 1.2.0 # Only needed for provisioning e2e azure-eventhub # Only needed for iothub e2e -psutil # Only needed for iothub e2e -six # Only needed for tests and should be removed ASAP a python2 backcompat should not be needed anymore. \ No newline at end of file +psutil # Only needed for iothub e2e \ No newline at end of file diff --git a/tests/e2e/iothub_e2e/device_identity_helper.py b/tests/e2e/iothub_e2e/device_identity_helper.py index 250f405f7..70322212b 100644 --- a/tests/e2e/iothub_e2e/device_identity_helper.py +++ b/tests/e2e/iothub_e2e/device_identity_helper.py @@ -7,7 +7,7 @@ from azure.iot.hub import IoTHubRegistryManager from base64 import b64encode, b64decode from hashlib import sha256 -from six.moves.urllib import parse +from urllib import parse from hmac import HMAC diff --git a/thirdpartynotice.txt b/thirdpartynotice.txt index 2a0c79d6a..fa87174aa 100644 --- a/thirdpartynotice.txt +++ b/thirdpartynotice.txt @@ -33,28 +33,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -2.) License Notice for six from https://raw.githubusercontent.com/benjaminp/six/master/LICENSE ------------------------------------------------------------------------------------------------------------------------ - -Copyright (c) 2010-2019 Benjamin Peterson - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - 3.) License Notice for paho-mqtt from https://raw.githubusercontent.com/PyCQA/astroid/master/COPYING -----------------------------------------------------------------------------------------------------------------------