[Python-checkins] distutils2: merge

[tarek.ziade]

tarek.ziade pushed 996c9c60d2b1 to distutils2:

http://hg.python.org/distutils2/rev/996c9c60d2b1
changeset:   698:996c9c60d2b1
parent:      690:37f948f6be6c
parent:      697:12c37807f046
user:        mlhamel
date:        Wed Sep 29 19:43:01 2010 -0400
summary:     merge
files:       

diff --git a/runtests-cov.py b/runtests-cov.py
--- a/runtests-cov.py
+++ b/runtests-cov.py
@@ -83,8 +83,15 @@
         # that module is also completely optional
         pass
 
-    cov.report(morfs, omit_prefixes=prefixes, show_missing=opts.show_missing)
-
+    try: 
+        cov.report(morfs, 
+                   omit_prefixes=prefixes, 
+                   show_missing=opts.show_missing)
+    except TypeError:
+        # Coverage 3.4 turned `omit_prefixes` into a list of globbing patterns
+        cov.report(morfs, 
+                   omit=[p+"*" for p in prefixes], 
+                   show_missing=opts.show_missing)
 
 def test_main():
     opts, args = parse_opts()

--
Repository URL: http://hg.python.org/distutils2