From 7112abbe5dd8aebf44c097043f413a0542c05e5c Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sat, 28 Jan 2017 03:11:23 +0300 Subject: add abstract classes for db readers/writers --- vk/tracking/db/backend/csv.py | 7 +++---- vk/tracking/db/backend/log.py | 4 +++- vk/tracking/db/backend/null.py | 8 ++++---- 3 files changed, 10 insertions(+), 9 deletions(-) (limited to 'vk/tracking/db/backend') diff --git a/vk/tracking/db/backend/csv.py b/vk/tracking/db/backend/csv.py index 5b2cc7d..6176018 100644 --- a/vk/tracking/db/backend/csv.py +++ b/vk/tracking/db/backend/csv.py @@ -3,13 +3,12 @@ # For details, see https://github.com/egor-tensin/vk-scripts. # Distributed under the MIT License. -from collections.abc import Iterable - +from .. import meta from ..io import InputReaderCSV, OutputWriterCSV from ..record import Record from ..timestamp import Timestamp -class Writer: +class Writer(meta.Writer): def __init__(self, fd): self._writer = OutputWriterCSV(fd) @@ -31,7 +30,7 @@ class Writer: def _record_to_row(record): return [str(record.get_timestamp())] + [str(record[field]) for field in record] -class Reader(Iterable): +class Reader(meta.Reader): def __init__(self, fd): self._reader = InputReaderCSV(fd) diff --git a/vk/tracking/db/backend/log.py b/vk/tracking/db/backend/log.py index f248d65..4ee5ff2 100644 --- a/vk/tracking/db/backend/log.py +++ b/vk/tracking/db/backend/log.py @@ -5,7 +5,9 @@ import logging -class Writer: +from .. import meta + +class Writer(meta.Writer): def __init__(self, fd): self._logger = logging.getLogger(__file__) self._logger.setLevel(logging.INFO) diff --git a/vk/tracking/db/backend/null.py b/vk/tracking/db/backend/null.py index 3cdb41e..663af10 100644 --- a/vk/tracking/db/backend/null.py +++ b/vk/tracking/db/backend/null.py @@ -3,9 +3,9 @@ # For details, see https://github.com/egor-tensin/vk-scripts. # Distributed under the MIT License. -from collections.abc import Iterable +from .. import meta -class Writer: +class Writer(meta.Writer): def __init__(self): pass @@ -18,9 +18,9 @@ class Writer: def on_connection_error(self, e): pass -class Reader(Iterable): +class Reader(meta.Reader): def __init__(self): pass def __iter__(self): - pass + return iter(()) -- cgit v1.2.3