From c7dafcedc37754c0bd5137960ab4ba6aebe86a9e Mon Sep 17 00:00:00 2001 From: stas Date: Thu, 1 Apr 2021 12:37:19 -0700 Subject: [PATCH] Do not convert config to lower case, instead do case-insencitive comparison --- cli/raft-tools/auth/python3/msal/msal_token.py | 15 +++++++++------ cli/raft-tools/libs/python3/raft.py | 16 ++++++++++------ cli/raft_sdk/raft_common.py | 15 +++++++++------ cli/raft_sdk/raft_deploy.py | 2 +- 4 files changed, 29 insertions(+), 19 deletions(-) diff --git a/cli/raft-tools/auth/python3/msal/msal_token.py b/cli/raft-tools/auth/python3/msal/msal_token.py index ad127673..967e0e85 100644 --- a/cli/raft-tools/auth/python3/msal/msal_token.py +++ b/cli/raft-tools/auth/python3/msal/msal_token.py @@ -5,16 +5,19 @@ class RaftJsonDict(dict): def __init__(self): - pass + super(RaftJsonDict, self).__init__() def __getitem__(self, key): - return super(RaftJsonDict, self).__getitem__(key.lower()) + for k in self.keys(): + if k.lower() == key.lower(): + break + return super(RaftJsonDict, self).__getitem__(key) def get(self, key): - return super(RaftJsonDict, self).get(key.lower()) - - def __setitem__(self, key, value): - return super(RaftJsonDict, self).__setitem__(key.lower(), value) + for k in self.keys(): + if k.lower() == key.lower(): + break + return super(RaftJsonDict, self).get(key) @staticmethod def raft_json_object_hook(x): diff --git a/cli/raft-tools/libs/python3/raft.py b/cli/raft-tools/libs/python3/raft.py index 5d72035d..474ee7cb 100644 --- a/cli/raft-tools/libs/python3/raft.py +++ b/cli/raft-tools/libs/python3/raft.py @@ -11,18 +11,22 @@ from urllib.parse import urlparse from contextlib import redirect_stdout + class RaftJsonDict(dict): def __init__(self): - pass + super(RaftJsonDict, self).__init__() def __getitem__(self, key): - return super(RaftJsonDict, self).__getitem__(key.lower()) + for k in self.keys(): + if k.lower() == key.lower(): + break + return super(RaftJsonDict, self).__getitem__(key) def get(self, key): - return super(RaftJsonDict, self).get(key.lower()) - - def __setitem__(self, key, value): - return super(RaftJsonDict, self).__setitem__(key.lower(), value) + for k in self.keys(): + if k.lower() == key.lower(): + break + return super(RaftJsonDict, self).get(key) @staticmethod def raft_json_object_hook(x): diff --git a/cli/raft_sdk/raft_common.py b/cli/raft_sdk/raft_common.py index 347f8898..c91cf121 100644 --- a/cli/raft_sdk/raft_common.py +++ b/cli/raft_sdk/raft_common.py @@ -43,16 +43,19 @@ def get_version(): class RaftJsonDict(dict): def __init__(self): - pass + super(RaftJsonDict, self).__init__() def __getitem__(self, key): - return super(RaftJsonDict, self).__getitem__(key.lower()) + for k in self.keys(): + if k.lower() == key.lower(): + break + return super(RaftJsonDict, self).__getitem__(key) def get(self, key): - return super(RaftJsonDict, self).get(key.lower()) - - def __setitem__(self, key, value): - return super(RaftJsonDict, self).__setitem__(key.lower(), value) + for k in self.keys(): + if k.lower() == key.lower(): + break + return super(RaftJsonDict, self).get(key) @staticmethod def raft_json_object_hook(x): diff --git a/cli/raft_sdk/raft_deploy.py b/cli/raft_sdk/raft_deploy.py index b61cc4aa..640e8b48 100644 --- a/cli/raft_sdk/raft_deploy.py +++ b/cli/raft_sdk/raft_deploy.py @@ -1334,4 +1334,4 @@ def wait_for_service_to_start(self, old_info=None): new_info = old_info time.sleep(3) sys.stdout.write('.') - sys.stdout.flush() + sys.stdout.flush() \ No newline at end of file