Skip to content
This repository was archived by the owner on Jun 3, 2025. It is now read-only.

Commit 37ebb53

Browse files
committed
Revert "Suppress analytics errors and messages (#318)"
This reverts commit 960cae2.
1 parent 960cae2 commit 37ebb53

File tree

3 files changed

+36
-87
lines changed

3 files changed

+36
-87
lines changed

src/sparsezoo/analytics.py

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import requests
2525

2626
from sparsezoo.utils.gdpr import is_gdpr_country
27-
from sparsezoo.utils.suppress import suppress_stdout_stderr
2827
from sparsezoo.version import version as sparsezoo_version
2928

3029

@@ -129,31 +128,30 @@ def send_event(
129128
event_params = {}
130129

131130
def _send_request():
132-
with suppress_stdout_stderr(suppress=not _DEBUG):
133-
event_params.update(self._package_params)
134-
event_params["package"] = self._package
135-
event_params["version"] = self._version
136-
payload = {
137-
"client_id": self._client_id,
138-
"events": [{"name": event_name, "params": event_params}],
139-
}
140-
headers = {
141-
"Content-Type": "application/json",
142-
}
143-
data = json.dumps(payload)
144-
145-
try:
146-
response = requests.post(self._url, headers=headers, data=data)
147-
response.raise_for_status()
148-
body = response.content
149-
if _DEBUG:
150-
print(body)
151-
except Exception as err:
152-
if _DEBUG:
153-
print(err)
154-
155-
if raise_errors:
156-
raise err
131+
event_params.update(self._package_params)
132+
event_params["package"] = self._package
133+
event_params["version"] = self._version
134+
payload = {
135+
"client_id": self._client_id,
136+
"events": [{"name": event_name, "params": event_params}],
137+
}
138+
headers = {
139+
"Content-Type": "application/json",
140+
}
141+
data = json.dumps(payload)
142+
143+
try:
144+
response = requests.post(self._url, headers=headers, data=data)
145+
response.raise_for_status()
146+
body = response.content
147+
if _DEBUG:
148+
print(body)
149+
except Exception as err:
150+
if _DEBUG:
151+
print(err)
152+
153+
if raise_errors:
154+
raise err
157155

158156
thread = threading.Thread(target=_send_request)
159157
thread.start()

src/sparsezoo/utils/gdpr.py

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
import geocoder
1818
import requests
1919

20-
from sparsezoo.utils.suppress import suppress_stdout_stderr
21-
2220

2321
__all__ = ["get_external_ip", "get_country_code", "is_gdpr_country"]
2422

@@ -58,28 +56,26 @@ def get_external_ip() -> Optional[str]:
5856
"""
5957
:return: the external ip of the machine, None if unable to get
6058
"""
61-
with suppress_stdout_stderr():
62-
try:
63-
response = requests.get("https://ident.me")
64-
external_ip = response.text.strip()
59+
try:
60+
response = requests.get("https://ident.me")
61+
external_ip = response.text.strip()
6562

66-
return external_ip
67-
except Exception:
68-
return None
63+
return external_ip
64+
except Exception:
65+
return None
6966

7067

7168
def get_country_code() -> Optional[str]:
7269
"""
7370
:return: the country code of the machine, None if unable to get
7471
"""
75-
with suppress_stdout_stderr():
76-
try:
77-
ip = get_external_ip()
78-
geo = geocoder.ip(ip)
72+
try:
73+
ip = get_external_ip()
74+
geo = geocoder.ip(ip)
7975

80-
return geo.country
81-
except Exception:
82-
return None
76+
return geo.country
77+
except Exception:
78+
return None
8379

8480

8581
def is_gdpr_country() -> bool:

src/sparsezoo/utils/suppress.py

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)