[Checkins] SVN: zope.testing/branches/regebro-python3/src/zope/testing/testrunner/ py3: None can't be compared to int anymore

[Wolfgang Schnerring]

Log message for revision 103882:
  py3: None can't be compared to int anymore
  

Changed:
  U   zope.testing/branches/regebro-python3/src/zope/testing/testrunner/formatter.py
  U   zope.testing/branches/regebro-python3/src/zope/testing/testrunner/runner.py

-=-
Modified: zope.testing/branches/regebro-python3/src/zope/testing/testrunner/formatter.py
===================================================================
--- zope.testing/branches/regebro-python3/src/zope/testing/testrunner/formatter.py	2009-09-13 08:28:45 UTC (rev 103881)
+++ zope.testing/branches/regebro-python3/src/zope/testing/testrunner/formatter.py	2009-09-13 08:29:32 UTC (rev 103882)
@@ -51,7 +51,7 @@
         self.compute_max_width()
 
     progress = property(lambda self: self.options.progress)
-    verbose = property(lambda self: self.options.verbose)
+    verbose = property(lambda self: self.options.verbose or 0)
     in_subprocess = property(
         lambda self: self.options.resume_layer is not None and
                      self.options.processes > 1)

Modified: zope.testing/branches/regebro-python3/src/zope/testing/testrunner/runner.py
===================================================================
--- zope.testing/branches/regebro-python3/src/zope/testing/testrunner/runner.py	2009-09-13 08:28:45 UTC (rev 103881)
+++ zope.testing/branches/regebro-python3/src/zope/testing/testrunner/runner.py	2009-09-13 08:29:32 UTC (rev 103882)
@@ -267,7 +267,7 @@
         if repeat > 1:
             output.info("Iteration %d" % (iteration + 1))
 
-        if options.verbose > 0 or options.progress:
+        if (options.verbose and options.verbose > 0) or options.progress:
             output.info('  Running:')
         result = TestResult(options, tests, layer_name=name)