commit ad771cd3265a4abfc4786d42ea0e7eb89786a986 Author: Isis Lovecruft isis@torproject.org Date: Thu Nov 1 08:56:31 2012 +0000

* Fixed a bug with a statement which was trying to to derive a key,value pair from a tuple. --- ooni/reporter.py | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ooni/reporter.py b/ooni/reporter.py index cedd016..b856948 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -178,10 +178,9 @@ class ReporterFactory(OReporter): @defer.inlineCallbacks def writeHeader(self): self.firstrun = False - options = self.options - log.debug("reporter.ReporterFactory.writeHeader(): options = %s" % options) + (klass, options) = self.options self._writeln("###########################################") - self._writeln("# OONI Probe Report for %s test" % options['name']) + self._writeln("# OONI Probe Report for %s test" % klass.name) self._writeln("# %s" % date.pretty_date()) self._writeln("###########################################")

@@ -208,8 +207,8 @@ class ReporterFactory(OReporter): 'probeLocation': {'city': client_geodata['city'], 'countrycode': client_geodata['countrycode']}, - 'testName': options['name'], - 'testVersion': options['version'], + 'testName': klass.name, + 'testVersion': klass.version, } self.writeYamlLine(test_details) self._writeln('')