diff options
Diffstat (limited to 'vk/tracking')
| -rw-r--r-- | vk/tracking/db/__init__.py | 2 | ||||
| -rw-r--r-- | vk/tracking/db/backend/csv.py | 4 | ||||
| -rw-r--r-- | vk/tracking/sessions.py | 6 |
3 files changed, 5 insertions, 7 deletions
diff --git a/vk/tracking/db/__init__.py b/vk/tracking/db/__init__.py index 06ae80a..51b1a7c 100644 --- a/vk/tracking/db/__init__.py +++ b/vk/tracking/db/__init__.py @@ -5,4 +5,4 @@ from .format import Format -__all__ = 'format' +__all__ = ('format',) diff --git a/vk/tracking/db/backend/csv.py b/vk/tracking/db/backend/csv.py index 70d44ac..1299064 100644 --- a/vk/tracking/db/backend/csv.py +++ b/vk/tracking/db/backend/csv.py @@ -43,6 +43,6 @@ class Reader(meta.Reader): @staticmethod def _record_from_row(row): record = Record(Timestamp.from_string(row[0])) - for i in range(len(Record.FIELDS)): - record[Record.FIELDS[i]] = row[i + 1] + for i, field in enumerate(Record.FIELDS): + record[field] = row[i + 1] return record diff --git a/vk/tracking/sessions.py b/vk/tracking/sessions.py index 6c4e787..5d545f1 100644 --- a/vk/tracking/sessions.py +++ b/vk/tracking/sessions.py @@ -57,13 +57,11 @@ class OnlineSessionEnumerator(MutableMapping): if self._time_from is not None: if ended_at < self._time_from: return None - if started_at < self._time_from: - started_at = self._time_from + started_at = max(started_at, self._time_from) if self._time_to is not None: if started_at > self._time_to: return None - if ended_at > self._time_to: - ended_at = self._time_to + ended_at = min(ended_at, self._time_to) return user, started_at, ended_at def read_database(self, db_reader): |