From fff13164dc45ffe1065baf5f8581d680b6c45f52 Mon Sep 17 00:00:00 2001
From: Jeremy Fee <jmfee@usgs.gov>
Date: Wed, 11 May 2016 12:11:34 -0600
Subject: [PATCH] Update temperature factories to use generic _get_timeseries
method
---
geomagio/temperature/StreamTEMPFactory.py | 6 ++----
geomagio/temperature/TEMPFactory.py | 6 ++----
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/geomagio/temperature/StreamTEMPFactory.py b/geomagio/temperature/StreamTEMPFactory.py
index c99b0ae9e..3aa2d940e 100644
--- a/geomagio/temperature/StreamTEMPFactory.py
+++ b/geomagio/temperature/StreamTEMPFactory.py
@@ -17,10 +17,8 @@ class StreamTEMPFactory(TEMPFactory):
TEMPFactory
Timeseriesfactory
"""
- def __init__(self, stream, observatory=None, channels=None,
- type=None, interval=None):
- TEMPFactory.__init__(self, None, observatory, channels,
- type, interval)
+ def __init__(self, stream, **kwargs):
+ TEMPFactory.__init__(self, **kwargs)
self._stream = stream
def get_timeseries(self, starttime, endtime, observatory=None,
diff --git a/geomagio/temperature/TEMPFactory.py b/geomagio/temperature/TEMPFactory.py
index 616d0e1a1..213c72806 100644
--- a/geomagio/temperature/TEMPFactory.py
+++ b/geomagio/temperature/TEMPFactory.py
@@ -32,10 +32,8 @@ class TEMPFactory(TimeseriesFactory):
TEMPParser
"""
- def __init__(self, urlTemplate, observatory=None, channels=None, type=None,
- interval=None):
- TimeseriesFactory.__init__(self, observatory, channels, type,
- interval, urlTemplate)
+ def __init__(self, **kwargs):
+ TimeseriesFactory.__init__(self, **kwargs)
def get_timeseries(self, starttime, endtime, observatory=None,
channels=None, type=None, interval=None):
--
GitLab