Skip to content

Commit 951616f

Browse files
committed
Deprecate cloudbot.util.http.open() due to shadowing the builtin open() function
1 parent 267752e commit 951616f

1 file changed

Lines changed: 21 additions & 6 deletions

File tree

cloudbot/util/http.py

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import urllib.request
1111
import urllib.request
1212
# noinspection PyUnresolvedReferences
13-
from urllib.error import URLError, HTTPError
13+
import warnings
1414
# noinspection PyUnresolvedReferences
1515
from urllib.parse import quote, quote_plus as _quote_plus
1616

@@ -35,13 +35,13 @@
3535

3636
def get(*args, **kwargs):
3737
if kwargs.get("decode", True):
38-
return open(*args, **kwargs).read().decode()
38+
return open_request(*args, **kwargs).read().decode()
3939
else:
40-
return open(*args, **kwargs).read()
40+
return open_request(*args, **kwargs).read()
4141

4242

4343
def get_url(*args, **kwargs):
44-
return open(*args, **kwargs).geturl()
44+
return open_request(*args, **kwargs).geturl()
4545

4646

4747
def get_html(*args, **kwargs):
@@ -61,8 +61,8 @@ def get_json(*args, **kwargs):
6161
return json.loads(get(*args, **kwargs))
6262

6363

64-
def open(url, query_params=None, user_agent=None, post_data=None,
65-
referer=None, get_method=None, cookies=False, timeout=None, headers=None, **kwargs):
64+
def open_request(url, query_params=None, user_agent=None, post_data=None, referer=None, get_method=None, cookies=False,
65+
timeout=None, headers=None, **kwargs):
6666
if query_params is None:
6767
query_params = {}
6868

@@ -98,6 +98,21 @@ def open(url, query_params=None, user_agent=None, post_data=None,
9898
return opener.open(request)
9999

100100

101+
# noinspection PyShadowingBuiltins
102+
def open(url, query_params=None, user_agent=None, post_data=None,
103+
referer=None, get_method=None, cookies=False, timeout=None, headers=None,
104+
**kwargs): # pylint: disable=locally-disabled, redefined-builtin
105+
warnings.warn(
106+
"http.open() is deprecated, use http.open_request() instead.",
107+
DeprecationWarning
108+
)
109+
110+
return open_request(
111+
url, query_params=query_params, user_agent=user_agent, post_data=post_data, referer=referer,
112+
get_method=get_method, cookies=cookies, timeout=timeout, headers=headers, **kwargs
113+
)
114+
115+
101116
def prepare_url(url, queries):
102117
if queries:
103118
scheme, netloc, path, query, fragment = urllib.parse.urlsplit(url)

0 commit comments

Comments
 (0)