Merge remote-tracking branch 'origin/master' into 6.0.x

This commit is contained in:
William Cheng
2021-02-12 18:48:20 +08:00
750 changed files with 34048 additions and 10711 deletions

View File

@@ -102,6 +102,7 @@ conf = x_auth_id_alias.Configuration(
def __init__(self, host=None,
api_key=None, api_key_prefix=None,
access_token=None,
username=None, password=None,
discard_unknown_keys=False,
disabled_client_side_validations="",
@@ -126,6 +127,7 @@ conf = x_auth_id_alias.Configuration(
"""Temp file folder for downloading files
"""
# Authentication Settings
self.access_token = access_token
self.api_key = {}
if api_key:
self.api_key = api_key