Skip to content

copy_df is called with None,None on init but df.index.searchsorted requires non-None arg #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CatrielD wants to merge 1 commit into
base: master
Choose a base branch
from
Open

copy_df is called with None,None on init but df.index.searchsorted requires non-None arg #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions src/speedtest_reader/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down