Skip to content

Commit a5c35a6

Browse files
authored
Merge pull request #5347 from S-T-A-R-L-O-R-D/master
make http/https_proxy env var checking case insensitive (address issue #5137)
2 parents f65487b + 56f4155 commit a5c35a6

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

CHANGELOG.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ Fixed
1515

1616
Contributed by @cognifloyd.
1717

18+
* Fixed ``st2client/st2client/base.py`` file to check for http_proxy and https_proxy environment variables for both lower and upper cases.
19+
20+
Contributed by @S-T-A-R-L-O-R-D
21+
1822
Added
1923
~~~~~
2024

st2client/st2client/base.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,12 @@ def _print_client_settings(self, args):
447447
print("")
448448
print("Proxy settings:")
449449
print("---------------")
450-
print("HTTP_PROXY: %s" % (os.environ.get("HTTP_PROXY", "")))
451-
print("HTTPS_PROXY: %s" % (os.environ.get("HTTPS_PROXY", "")))
450+
print(
451+
"HTTP_PROXY: %s"
452+
% (os.environ.get("http_proxy", os.environ.get("HTTP_PROXY", "")))
453+
)
454+
print(
455+
"HTTPS_PROXY: %s"
456+
% (os.environ.get("http_proxy", os.environ.get("HTTPS_PROXY", "")))
457+
)
452458
print("")

0 commit comments

Comments
 (0)