From f835d216dbbdd12f61e540d63b6fa50605ba7974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 6 Nov 2022 09:42:50 +0200 Subject: [PATCH] Use `Optional[str]` instead of `Union[str, None]` --- huawei_lte_api/Tools.py | 4 ++-- huawei_lte_api/api/User.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/huawei_lte_api/Tools.py b/huawei_lte_api/Tools.py index 5961ad9..04b62f2 100644 --- a/huawei_lte_api/Tools.py +++ b/huawei_lte_api/Tools.py @@ -1,4 +1,4 @@ -from typing import Union, Tuple +from typing import Optional, Tuple from binascii import hexlify import math @@ -10,7 +10,7 @@ class Tools: @staticmethod - def enforce_list_response(data: dict, singular_key_name: str, plural_key_name: Union[str, None] = None) -> dict: + def enforce_list_response(data: dict, singular_key_name: str, plural_key_name: Optional[str] = None) -> dict: """ Make sure Hosts->Host is a list It may be returned as a single dict if only one is associated, diff --git a/huawei_lte_api/api/User.py b/huawei_lte_api/api/User.py index c086b8c..83790c9 100644 --- a/huawei_lte_api/api/User.py +++ b/huawei_lte_api/api/User.py @@ -2,7 +2,7 @@ import hashlib import time from types import TracebackType -from typing import Union, Type, Optional +from typing import Type, Optional import requests from huawei_lte_api.ApiGroup import ApiGroup @@ -22,7 +22,7 @@ class UserSession: - def __init__(self, session: Session, username: str = DEFAULT_USERNAME, password: Union[str, None] = None): + def __init__(self, session: Session, username: str = DEFAULT_USERNAME, password: Optional[str] = None): self.user = User(session) self.user.login(username, password, True) @@ -43,7 +43,7 @@ class User(ApiGroup): def state_login(self) -> GetResponseType: return self._session.get('user/state-login') - def _login(self, username: str, password: Union[str, None], password_type: PasswordTypeEnum = PasswordTypeEnum.BASE_64) -> bool: + def _login(self, username: str, password: Optional[str], password_type: PasswordTypeEnum = PasswordTypeEnum.BASE_64) -> bool: if not password: password_encoded = b'' else: @@ -88,7 +88,7 @@ def _login(self, username: str, password: Union[str, None], password_type: Passw return result == ResponseEnum.OK.value - def login(self, username: str = DEFAULT_USERNAME, password: Union[str, None] = None, force_new_login: bool = False) -> bool: + def login(self, username: str = DEFAULT_USERNAME, password: Optional[str] = None, force_new_login: bool = False) -> bool: if username == '': # <= 1.6.4 backwards compatibility username = DEFAULT_USERNAME tries = 5