Delay conversion of template text to StringIO

This allows service classes to initialise the base class before
extending the template.

Signed-off-by: Jim Easterbrook <jim@jim-easterbrook.me.uk>

src/pywws/__init__.py

@@ -1,3 +1,3 @@
 __version__ = '18.8.0'
-_release = '1600'
-_commit = '3b0b49d'
+_release = '1601'
+_commit = 'b22a84b'

src/pywws/service/__init__.py

@@ -192,7 +192,7 @@ def __init__(self, context, check_params=True):
         # create templater
         if self.template:
             self.templater = pywws.template.Template(context, use_locale=False)
-            self.template_file = StringIO(self.template)
+            self.template_file = None
         # get time stamp of last uploaded data
         self.last_update = context.status.get_datetime(
             'last update', self.service_name)
@@ -204,6 +204,8 @@ def queue_data(self, timestamp, data, live):
             return False
         if not self.valid_data(data):
             return False
+        if not self.template_file:
+            self.template_file = StringIO(self.template)
         data_str = self.templater.make_text(self.template_file, data)
         self.template_file.seek(0)
         prepared_data = eval('{' + data_str + '}')

src/pywws/service/pwsweather.py

@@ -79,13 +79,13 @@ class ToService(pywws.service.CatchupDataService):
 """
 
     def __init__(self, context, check_params=True):
+        super(ToService, self).__init__(context, check_params)
         # extend template
         if context.params.get('config', 'ws type') == '3080':
             self.template += """
 #illuminance  "'solarradiation': '%.2f'," "" "illuminance_wm2(x)"#
 #uv           "'UV'            : '%d',"#
 """
-        super(ToService, self).__init__(context, check_params)
 
     @contextmanager
     def session(self):

src/pywws/service/underground.py

@@ -91,6 +91,7 @@ class ToService(pywws.service.CatchupDataService):
 """
 
     def __init__(self, context, check_params=True):
+        super(ToService, self).__init__(context, check_params)
         # extend template
         if context.params.get('config', 'ws type') == '3080':
             self.template += """
@@ -102,7 +103,6 @@ def __init__(self, context, check_params=True):
 #hum_in       "'indoorhumidity': '%.d',"#
 #temp_in      "'indoortempf'   : '%.1f'," "" "temp_f(x)"#
 """
-        super(ToService, self).__init__(context, check_params)
 
     @contextmanager
     def session(self):

src/pywws/service/wetterarchivde.py

@@ -82,10 +82,10 @@ class ToService(pywws.service.CatchupDataService):
 """
 
     def __init__(self, context, check_params=True):
+        super(ToService, self).__init__(context, check_params)
         # extend template
         if context.params.get('config', 'ws type') == '3080':
             self.template += """#uv "'uv': '%d',"#"""
-        super(ToService, self).__init__(context, check_params)
 
     @contextmanager
     def session(self):