Skip to content

Commit

Permalink
Reinstate 'prepare_data' method
Browse files Browse the repository at this point in the history
I'd forgotten that pywws.service.metoffice requires it.

Signed-off-by: Jim Easterbrook <jim@jim-easterbrook.me.uk>
  • Loading branch information
jim-easterbrook committed Aug 29, 2018
1 parent a46178b commit 0dfa5e2
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/pywws/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
__version__ = '18.8.0'
_release = '1608'
_commit = '8d0bfd2'
_release = '1609'
_commit = 'a46178b'
13 changes: 8 additions & 5 deletions src/pywws/service/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -263,18 +263,21 @@ 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 + '}')
prepared_data = self.prepare_data(data)
prepared_data.update(self.fixed_data)
self.logger.debug('data: %s', str(prepared_data))
self.queue.append((timestamp, prepared_data, live))
if timestamp:
self.last_update = timestamp
return True

def prepare_data(self, data):
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)
return eval('{' + data_str + '}')

def valid_data(self, data):
return True

Expand Down

0 comments on commit 0dfa5e2

Please sign in to comment.