From a213191fc1a4f2d8ebdef0912e33610ac9326a3b Mon Sep 17 00:00:00 2001 From: cato Date: Fri, 27 Mar 2020 09:48:16 -0300 Subject: [PATCH] copy_df is called with None,None on init but df.index.searchsorted requires non-None arg --- src/speedtest_reader/__init__.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/speedtest_reader/__init__.py b/src/speedtest_reader/__init__.py index 339562f..8dae5e0 100644 --- a/src/speedtest_reader/__init__.py +++ b/src/speedtest_reader/__init__.py @@ -11,7 +11,6 @@ from pkg_resources import get_distribution, DistributionNotFound from speedtest_reader import util -from speedtest_reader.util import ValidationException __author__ = "Tobias Frei" __copyright__ = "Tobias Frei" @@ -59,10 +58,7 @@ def __init__(self, source, cols=None): # eager initialisation self._status = "INIT" - try: - self._ramdf = self.copy_df(None, None) - except Exception as e: - raise ValidationException(e, "Cannot read '{}'.".format(source)) + self._ramdf = self.copy_df(None, None) self._status = "READ" @util.stopwatch @@ -109,12 +105,13 @@ def copy_df(self, start, end): ) # Find index values for slicing. - lower = self._ramdf.index.searchsorted(start) - upper = self._ramdf.index.searchsorted(end) + if end: + upper = self._ramdf.index.searchsorted(end) # Slice according to values. df = self._ramdf if start: + lower = self._ramdf.index.searchsorted(start) if end: df = df.iloc[lower:upper] else: