Skip to content

Commit 7e981f0

Browse files
committed
remove _get_results and directly call the make_request
1 parent 6632898 commit 7e981f0

1 file changed

Lines changed: 8 additions & 16 deletions

File tree

domaintools/results.py

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
1-
"""Defines the used Result object based on the current versions and/or features available to Python runtime
2-
1+
"""
2+
Defines the used Result object based on the current versions and/or features available to Python runtime
33
Additionally, defines any custom result objects that may be used to enable more Pythonic interaction with endpoints.
44
"""
55

66
import logging
7+
from itertools import zip_longest, chain
8+
from typing import Generator
9+
710
import httpx
8-
import time
911

1012
try: # pragma: no cover
1113
from collections import OrderedDict
1214
except ImportError: # pragma: no cover
1315
from ordereddict import OrderedDict
1416

15-
from itertools import zip_longest, chain
16-
from typing import Generator
1717

1818
from domaintools_async import AsyncResults as Results
1919

20-
2120
log = logging.getLogger(__name__)
2221

2322

@@ -243,16 +242,8 @@ def _make_request(self) -> Generator:
243242
for line in response.iter_lines():
244243
yield line
245244

246-
def _get_results(self) -> Generator:
247-
try:
248-
feeds_generator = self._make_request()
249-
yield from feeds_generator
250-
except Exception as e:
251-
self.setStatus(500, reason_text=e)
252-
return
253-
254245
def data(self) -> Generator:
255-
self._data = self._get_results()
246+
self._data = self._make_request()
256247
return self._data
257248

258249
def response(self) -> Generator:
@@ -261,7 +252,8 @@ def response(self) -> Generator:
261252

262253
if not self.kwargs.get("sessionID"):
263254
# we'll only do iterative request for queries that has sessionID.
264-
# Otherwise, we will have an infinite request if sessionID was not provided but the required data asked is more than the maximum (1 hour of data)
255+
# Otherwise, we will have an infinite request if sessionID was not provided
256+
# but the required data asked is more than the maximum (1 hour of data)
265257
break
266258
self._status = None
267259

0 commit comments

Comments
 (0)