|
11 | 11 | from ruz.schema import API_ENDPOINTS, API_URL, REQUEST_SCHEMA |
12 | 12 |
|
13 | 13 | CHECK_EMAIL_ONLINE = bool(os.environ.get("CHECK_EMAIL_ONLINE", False)) |
14 | | -USE_NONE_SAFE_VALUES = bool(os.environ.get("USE_NONE_SAFE_VALUES", True)) |
| 14 | + |
15 | 15 | HSE_EMAIL_REGEX = re.compile(r"^[a-z0-9\._-]{3,}@(edu\.)?hse\.ru$") |
16 | 16 |
|
17 | 17 |
|
@@ -167,25 +167,23 @@ def make_url(endpoint: str, **params) -> str: |
167 | 167 | @log |
168 | 168 | def get(endpoint: str, |
169 | 169 | encoding: str="utf-8", |
170 | | - return_none_safe: bool=USE_NONE_SAFE_VALUES, |
171 | 170 | **params) -> (list, dict, None): |
172 | 171 | """ |
173 | | - Return requested data in JSON |
| 172 | + Return requested data in JSON (empty list on fallback) |
174 | 173 |
|
175 | 174 | Check request has correct schema. |
176 | 175 |
|
177 | 176 | :param endpoint - endpoint for request. |
178 | 177 | :param encoding - encoding for received data. |
179 | | - :param return_none_safe - return empty list on fallback. |
180 | 178 | :param params - requested params |
181 | 179 | """ |
182 | 180 | if not is_valid_schema(endpoint, **params): |
183 | | - return [] if return_none_safe else None |
| 181 | + return [] |
184 | 182 |
|
185 | 183 | url = make_url(endpoint, **params) |
186 | 184 | try: |
187 | 185 | response = request.urlopen(url) |
188 | 186 | return json.loads(response.read().decode(encoding)) |
189 | 187 | except (error.HTTPError, error.URLError) as err: |
190 | 188 | logging.debug("Can't get '%s'.\n%s", url, err) |
191 | | - return [] if return_none_safe else None |
| 189 | + return [] |
0 commit comments