[Python-checkins] r60087 - in python/trunk: Doc/library/trace.rst Lib/trace.py

Sat Jan 19 19:38:20 CET 2008

Author: facundo.batista
Date: Sat Jan 19 19:38:19 2008
New Revision: 60087
Modified:
 python/trunk/Doc/library/trace.rst
 python/trunk/Lib/trace.py
Log:
Fix #1693149. Now you can pass several modules separated by
coma to trace.py in the same --ignore-module option. 
Thanks Raghuram Devarakonda.
Modified: python/trunk/Doc/library/trace.rst
==============================================================================

--- python/trunk/Doc/library/trace.rst	(original)
+++ python/trunk/Doc/library/trace.rst	Sat Jan 19 19:38:19 2008
@@ -64,12 +64,14 @@
 stdout for each file processed.
 
 :option:`--ignore-module`
- Ignore the named module and its submodules (if it is a package). May be given
+ Accepts comma separated list of module names. Ignore each of the named
+ module and its submodules (if it is a package). May be given 
 multiple times.
 
 :option:`--ignore-dir`
- Ignore all modules and packages in the named directory and subdirectories. May
- be given multiple times.
+ Ignore all modules and packages in the named directory and subdirectories
+ (multiple directories can be joined by os.pathsep). May be given multiple
+ times. 
 
 
 .. _trace-api:
Modified: python/trunk/Lib/trace.py
==============================================================================
--- python/trunk/Lib/trace.py	(original)
+++ python/trunk/Lib/trace.py	Sat Jan 19 19:38:19 2008
@@ -100,8 +100,9 @@
 (Can only be used with --count or --report.)
 
 Filters, may be repeated multiple times:
---ignore-module=<mod> Ignore the given module and its submodules
- (if it is a package).
+--ignore-module=<mod> Ignore the given module(s) and its submodules
+ (if it is a package). Accepts comma separated
+ list of module names
 --ignore-dir=<dir> Ignore files in the given directory (multiple
 directories can be joined by os.pathsep).
 """ % sys.argv[0])
@@ -729,7 +730,8 @@
 continue
 
 if opt == "--ignore-module":
- ignore_modules.append(val)
+ for mod in val.split(","):
+ ignore_modules.append(mod.strip())
 continue
 
 if opt == "--ignore-dir":
