Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix and format by ruff #1161

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion azure-iot-device/azure/iot/device/aio/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,6 @@

patch_documentation.execute_patch_for_async()

__all__ = azure.iot.device.iothub.aio.__all__ + azure.iot.device.provisioning.aio.__all__
__all__ = (
azure.iot.device.iothub.aio.__all__ + azure.iot.device.provisioning.aio.__all__
)
102 changes: 79 additions & 23 deletions azure-iot-device/azure/iot/device/aio/patch_documentation.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@


def execute_patch_for_async():
from azure.iot.device.iothub.aio.async_clients import IoTHubDeviceClient as IoTHubDeviceClient
from azure.iot.device.iothub.aio.async_clients import (
IoTHubDeviceClient as IoTHubDeviceClient,
)

async def connect(self):
return await super(IoTHubDeviceClient, self).connect()
Expand Down Expand Up @@ -36,7 +38,11 @@ async def patch_twin_reported_properties(self, reported_properties_patch):
patch_twin_reported_properties.__doc__ = (
IoTHubDeviceClient.patch_twin_reported_properties.__doc__
)
setattr(IoTHubDeviceClient, "patch_twin_reported_properties", patch_twin_reported_properties)
setattr(
IoTHubDeviceClient,
"patch_twin_reported_properties",
patch_twin_reported_properties,
)

def receive_method_request(self, method_name=None):
return super(IoTHubDeviceClient, self).receive_method_request(method_name)
Expand All @@ -63,7 +69,9 @@ async def send_message(self, message):
setattr(IoTHubDeviceClient, "send_message", send_message)

async def send_method_response(self, method_response):
return await super(IoTHubDeviceClient, self).send_method_response(method_response)
return await super(IoTHubDeviceClient, self).send_method_response(
method_response
)

send_method_response.__doc__ = IoTHubDeviceClient.send_method_response.__doc__
setattr(IoTHubDeviceClient, "send_method_response", send_method_response)
Expand All @@ -85,7 +93,9 @@ def create_from_connection_string(cls, connection_string, **kwargs):
connection_string, **kwargs
)

create_from_connection_string.__doc__ = IoTHubDeviceClient.create_from_connection_string.__doc__
create_from_connection_string.__doc__ = (
IoTHubDeviceClient.create_from_connection_string.__doc__
)
setattr(
IoTHubDeviceClient,
"create_from_connection_string",
Expand All @@ -96,51 +106,71 @@ def create_from_sastoken(cls, sastoken, **kwargs):
return super(IoTHubDeviceClient, cls).create_from_sastoken(sastoken, **kwargs)

create_from_sastoken.__doc__ = IoTHubDeviceClient.create_from_sastoken.__doc__
setattr(IoTHubDeviceClient, "create_from_sastoken", classmethod(create_from_sastoken))
setattr(
IoTHubDeviceClient, "create_from_sastoken", classmethod(create_from_sastoken)
)

def create_from_symmetric_key(cls, symmetric_key, hostname, device_id, **kwargs):
return super(IoTHubDeviceClient, cls).create_from_symmetric_key(
symmetric_key, hostname, device_id, **kwargs
)

create_from_symmetric_key.__doc__ = IoTHubDeviceClient.create_from_symmetric_key.__doc__
setattr(IoTHubDeviceClient, "create_from_symmetric_key", classmethod(create_from_symmetric_key))
create_from_symmetric_key.__doc__ = (
IoTHubDeviceClient.create_from_symmetric_key.__doc__
)
setattr(
IoTHubDeviceClient,
"create_from_symmetric_key",
classmethod(create_from_symmetric_key),
)

def create_from_x509_certificate(cls, x509, hostname, device_id, **kwargs):
return super(IoTHubDeviceClient, cls).create_from_x509_certificate(
x509, hostname, device_id, **kwargs
)

create_from_x509_certificate.__doc__ = IoTHubDeviceClient.create_from_x509_certificate.__doc__
create_from_x509_certificate.__doc__ = (
IoTHubDeviceClient.create_from_x509_certificate.__doc__
)
setattr(
IoTHubDeviceClient,
"create_from_x509_certificate",
classmethod(create_from_x509_certificate),
)
setattr(IoTHubDeviceClient, "connected", IoTHubDeviceClient.connected)
setattr(
IoTHubDeviceClient, "on_background_exception", IoTHubDeviceClient.on_background_exception
IoTHubDeviceClient,
"on_background_exception",
IoTHubDeviceClient.on_background_exception,
)
setattr(
IoTHubDeviceClient,
"on_connection_state_change",
IoTHubDeviceClient.on_connection_state_change,
)
setattr(IoTHubDeviceClient, "on_message_received", IoTHubDeviceClient.on_message_received)
setattr(
IoTHubDeviceClient,
"on_message_received",
IoTHubDeviceClient.on_message_received,
)
setattr(
IoTHubDeviceClient,
"on_method_request_received",
IoTHubDeviceClient.on_method_request_received,
)
setattr(
IoTHubDeviceClient, "on_new_sastoken_required", IoTHubDeviceClient.on_new_sastoken_required
IoTHubDeviceClient,
"on_new_sastoken_required",
IoTHubDeviceClient.on_new_sastoken_required,
)
setattr(
IoTHubDeviceClient,
"on_twin_desired_properties_patch_received",
IoTHubDeviceClient.on_twin_desired_properties_patch_received,
)
from azure.iot.device.iothub.aio.async_clients import IoTHubModuleClient as IoTHubModuleClient
from azure.iot.device.iothub.aio.async_clients import (
IoTHubModuleClient as IoTHubModuleClient,
)

async def connect(self):
return await super(IoTHubModuleClient, self).connect()
Expand Down Expand Up @@ -168,7 +198,11 @@ async def patch_twin_reported_properties(self, reported_properties_patch):
patch_twin_reported_properties.__doc__ = (
IoTHubModuleClient.patch_twin_reported_properties.__doc__
)
setattr(IoTHubModuleClient, "patch_twin_reported_properties", patch_twin_reported_properties)
setattr(
IoTHubModuleClient,
"patch_twin_reported_properties",
patch_twin_reported_properties,
)

def receive_method_request(self, method_name=None):
return super(IoTHubModuleClient, self).receive_method_request(method_name)
Expand All @@ -195,7 +229,9 @@ async def send_message(self, message):
setattr(IoTHubModuleClient, "send_message", send_message)

async def send_method_response(self, method_response):
return await super(IoTHubModuleClient, self).send_method_response(method_response)
return await super(IoTHubModuleClient, self).send_method_response(
method_response
)

send_method_response.__doc__ = IoTHubModuleClient.send_method_response.__doc__
setattr(IoTHubModuleClient, "send_method_response", send_method_response)
Expand All @@ -217,7 +253,9 @@ def create_from_connection_string(cls, connection_string, **kwargs):
connection_string, **kwargs
)

create_from_connection_string.__doc__ = IoTHubModuleClient.create_from_connection_string.__doc__
create_from_connection_string.__doc__ = (
IoTHubModuleClient.create_from_connection_string.__doc__
)
setattr(
IoTHubModuleClient,
"create_from_connection_string",
Expand All @@ -227,7 +265,9 @@ def create_from_connection_string(cls, connection_string, **kwargs):
def create_from_edge_environment(cls, **kwargs):
return super(IoTHubModuleClient, cls).create_from_edge_environment(**kwargs)

create_from_edge_environment.__doc__ = IoTHubModuleClient.create_from_edge_environment.__doc__
create_from_edge_environment.__doc__ = (
IoTHubModuleClient.create_from_edge_environment.__doc__
)
setattr(
IoTHubModuleClient,
"create_from_edge_environment",
Expand All @@ -238,36 +278,50 @@ def create_from_sastoken(cls, sastoken, **kwargs):
return super(IoTHubModuleClient, cls).create_from_sastoken(sastoken, **kwargs)

create_from_sastoken.__doc__ = IoTHubModuleClient.create_from_sastoken.__doc__
setattr(IoTHubModuleClient, "create_from_sastoken", classmethod(create_from_sastoken))
setattr(
IoTHubModuleClient, "create_from_sastoken", classmethod(create_from_sastoken)
)

def create_from_x509_certificate(cls, x509, hostname, device_id, module_id, **kwargs):
def create_from_x509_certificate(
cls, x509, hostname, device_id, module_id, **kwargs
):
return super(IoTHubModuleClient, cls).create_from_x509_certificate(
x509, hostname, device_id, module_id, **kwargs
)

create_from_x509_certificate.__doc__ = IoTHubModuleClient.create_from_x509_certificate.__doc__
create_from_x509_certificate.__doc__ = (
IoTHubModuleClient.create_from_x509_certificate.__doc__
)
setattr(
IoTHubModuleClient,
"create_from_x509_certificate",
classmethod(create_from_x509_certificate),
)
setattr(IoTHubModuleClient, "connected", IoTHubModuleClient.connected)
setattr(
IoTHubModuleClient, "on_background_exception", IoTHubModuleClient.on_background_exception
IoTHubModuleClient,
"on_background_exception",
IoTHubModuleClient.on_background_exception,
)
setattr(
IoTHubModuleClient,
"on_connection_state_change",
IoTHubModuleClient.on_connection_state_change,
)
setattr(IoTHubModuleClient, "on_message_received", IoTHubModuleClient.on_message_received)
setattr(
IoTHubModuleClient,
"on_message_received",
IoTHubModuleClient.on_message_received,
)
setattr(
IoTHubModuleClient,
"on_method_request_received",
IoTHubModuleClient.on_method_request_received,
)
setattr(
IoTHubModuleClient, "on_new_sastoken_required", IoTHubModuleClient.on_new_sastoken_required
IoTHubModuleClient,
"on_new_sastoken_required",
IoTHubModuleClient.on_new_sastoken_required,
)
setattr(
IoTHubModuleClient,
Expand All @@ -285,7 +339,9 @@ def create_from_symmetric_key(
provisioning_host, registration_id, id_scope, symmetric_key, **kwargs
)

create_from_symmetric_key.__doc__ = ProvisioningDeviceClient.create_from_symmetric_key.__doc__
create_from_symmetric_key.__doc__ = (
ProvisioningDeviceClient.create_from_symmetric_key.__doc__
)
setattr(
ProvisioningDeviceClient,
"create_from_symmetric_key",
Expand Down
12 changes: 9 additions & 3 deletions azure-iot-device/azure/iot/device/common/auth/sastoken.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ class RenewableSasToken(object):
_auth_rule_token_format = (
"SharedAccessSignature sr={resource}&sig={signature}&se={expiry}&skn={keyname}"
)
_simple_token_format = "SharedAccessSignature sr={resource}&sig={signature}&se={expiry}"
_simple_token_format = (
"SharedAccessSignature sr={resource}&sig={signature}&se={expiry}"
)

def __init__(self, uri, signing_mechanism, key_name=None, ttl=3600):
"""
Expand All @@ -44,7 +46,9 @@ def __init__(self, uri, signing_mechanism, key_name=None, ttl=3600):
self._uri = uri
self._signing_mechanism = signing_mechanism
self._key_name = key_name
self._expiry_time = None # This will be overwritten by the .refresh() call below
self._expiry_time = (
None # This will be overwritten by the .refresh() call below
)
self._token = None # This will be overwritten by the .refresh() call below

self.ttl = ttl
Expand Down Expand Up @@ -139,7 +143,9 @@ def get_sastoken_info_from_string(sastoken_string):

# Get sastoken info as dictionary
try:
sastoken_info = dict(map(str.strip, sub.split("=", 1)) for sub in pieces[1].split("&"))
sastoken_info = dict(
map(str.strip, sub.split("=", 1)) for sub in pieces[1].split("&")
)
except Exception as e:
raise SasTokenError("Invalid SasToken string: Incorrectly formatted") from e

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def __init__(self, key):
# CT-TODO: is "signing key" the right term?
try:
self._signing_key = base64.b64decode(key)
except (base64.binascii.Error):
except base64.binascii.Error:
raise ValueError("Invalid Symmetric Key")

def sign(self, data_str):
Expand All @@ -62,7 +62,7 @@ def sign(self, data_str):
key=self._signing_key, msg=data_str, digestmod=hashlib.sha256
).digest()
signed_data = base64.b64encode(hmac_digest)
except (TypeError):
except TypeError:
raise ValueError("Unable to sign string using the provided symmetric key")
# Convert from bytes to string
return signed_data.decode("utf-8")
37 changes: 30 additions & 7 deletions azure-iot-device/azure/iot/device/common/http_transport.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,23 +132,43 @@ def request(self, method, path, callback, body="", headers={}, query_params=""):
# via the HTTPAdapter that was mounted at session level.
if method == "GET":
response = session.get(
url, data=body, headers=headers, proxies=self._proxies, timeout=HTTP_TIMEOUT
url,
data=body,
headers=headers,
proxies=self._proxies,
timeout=HTTP_TIMEOUT,
)
elif method == "POST":
response = session.post(
url, data=body, headers=headers, proxies=self._proxies, timeout=HTTP_TIMEOUT
url,
data=body,
headers=headers,
proxies=self._proxies,
timeout=HTTP_TIMEOUT,
)
elif method == "PUT":
response = session.put(
url, data=body, headers=headers, proxies=self._proxies, timeout=HTTP_TIMEOUT
url,
data=body,
headers=headers,
proxies=self._proxies,
timeout=HTTP_TIMEOUT,
)
elif method == "PATCH":
response = session.patch(
url, data=body, headers=headers, proxies=self._proxies, timeout=HTTP_TIMEOUT
url,
data=body,
headers=headers,
proxies=self._proxies,
timeout=HTTP_TIMEOUT,
)
elif method == "DELETE":
response = session.delete(
url, data=body, headers=headers, proxies=self._proxies, timeout=HTTP_TIMEOUT
url,
data=body,
headers=headers,
proxies=self._proxies,
timeout=HTTP_TIMEOUT,
)
else:
raise ValueError("Invalid method type: {}".format(method))
Expand All @@ -164,7 +184,9 @@ def request(self, method, path, callback, body="", headers={}, query_params=""):
callback(error=e)
except Exception as e:
# Raise error via the callback
new_err = exceptions.ProtocolClientError("Unexpected HTTPS failure during connect")
new_err = exceptions.ProtocolClientError(
"Unexpected HTTPS failure during connect"
)
new_err.__cause__ = e
callback(error=new_err)
else:
Expand All @@ -190,7 +212,8 @@ def format_proxies(proxy_options):
# Add credentials if necessary
if proxy_options.proxy_username and proxy_options.proxy_password:
auth = "{username}:{password}".format(
username=proxy_options.proxy_username, password=proxy_options.proxy_password
username=proxy_options.proxy_username,
password=proxy_options.proxy_password,
)
proxy = auth + "@" + proxy
# Set proxy for use on HTTP or HTTPS connections
Expand Down
Loading
Loading