Commits

Anonymous committed 967c569

Fixed typos for real, damn it. Bed time.

Comments (0)

Files changed (1)

         self.timings = {}
     return wrapper
 
-def monkeyPatchTiming(times_run):
+def monkeyPatchTiming(times_runtiming):
     unittest.TestCase.run = unittest_TestCase_run
     unittest.TestCase.times_run = times_run
     
 # For complete failures (+ namespace saving)
 
 def from_namespace(ns, template):
-    return dict((i, ns.get(i, template[i])) for i in template)
+    if isinstance(template, dict):
+        return dict((i, ns.get(i, template[i])) for i in template)
+    else:
+        return dict((i, ns[i]) for i in template)
 
 RESULTS_TEMPLATE = {
     'output'     :  '',
             [e.strip() for e in options.exclude.split(',')]
         )
     
-    if options.profile: monkeyPatchTiming(options.profile)
+    if options.timings: monkeyPatchTiming(options.timings)
 
     ########################################################################
     # load modules, filtering by tag
     num_tests = results.testsRun
     failures  = results.monkeyedFailRepr('FAIL', results.failures)
     errors    = results.monkeyedFailRepr('ERROR', results.errors)
-    if options.profile:
+    if options.timings:
         timings   = results.timings
 
     ########################################################################