diff options
| author | Georg Brandl <georg@python.org> | 2009-09-16 16:05:59 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-09-16 16:05:59 (GMT) |
| commit | b044b2a701179dc6f8d50d28c7d4486e0d0d7a09 (patch) | |
| tree | 3337a0b5e15ca883b815062cdac083449a093049 /Lib/warnings.py | |
| parent | f4b4623a309fe2548e7b2987674b4e68f5b8f0e1 (diff) | |
| download | cpython-b044b2a701179dc6f8d50d28c7d4486e0d0d7a09.zip cpython-b044b2a701179dc6f8d50d28c7d4486e0d0d7a09.tar.gz cpython-b044b2a701179dc6f8d50d28c7d4486e0d0d7a09.tar.bz2 | |
Merged revisions 74821,74828-74831,74833,74835 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
................
r74821 | georg.brandl | 2009-09-16 11:42:19 +0200 (Mi, 16 Sep 2009) | 1 line
#6885: run python 3 as python3.
................
r74828 | georg.brandl | 2009-09-16 16:23:20 +0200 (Mi, 16 Sep 2009) | 1 line
Use true booleans.
................
r74829 | georg.brandl | 2009-09-16 16:24:29 +0200 (Mi, 16 Sep 2009) | 1 line
Small PEP8 correction.
................
r74830 | georg.brandl | 2009-09-16 16:36:22 +0200 (Mi, 16 Sep 2009) | 1 line
Use true booleans.
................
r74831 | georg.brandl | 2009-09-16 17:54:04 +0200 (Mi, 16 Sep 2009) | 1 line
Use true booleans and PEP8 for argdefaults.
................
r74833 | georg.brandl | 2009-09-16 17:58:14 +0200 (Mi, 16 Sep 2009) | 1 line
Last round of adapting style of documenting argument default values.
................
r74835 | georg.brandl | 2009-09-16 18:00:31 +0200 (Mi, 16 Sep 2009) | 33 lines
Merged revisions 74817-74820,74822-74824 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74817 | georg.brandl | 2009-09-16 11:05:11 +0200 (Mi, 16 Sep 2009) | 1 line
Make deprecation notices as visible as warnings are right now.
........
r74818 | georg.brandl | 2009-09-16 11:23:04 +0200 (Mi, 16 Sep 2009) | 1 line
#6880: add reference to classes section in exceptions section, which comes earlier.
........
r74819 | georg.brandl | 2009-09-16 11:24:57 +0200 (Mi, 16 Sep 2009) | 1 line
#6876: fix base class constructor invocation in example.
........
r74820 | georg.brandl | 2009-09-16 11:30:48 +0200 (Mi, 16 Sep 2009) | 1 line
#6891: comment out dead link to Unicode article.
........
r74822 | georg.brandl | 2009-09-16 12:12:06 +0200 (Mi, 16 Sep 2009) | 1 line
#5621: refactor description of how class/instance attributes interact on a.x=a.x+1 or augassign.
........
r74823 | georg.brandl | 2009-09-16 15:06:22 +0200 (Mi, 16 Sep 2009) | 1 line
Remove strange trailing commas.
........
r74824 | georg.brandl | 2009-09-16 15:11:06 +0200 (Mi, 16 Sep 2009) | 1 line
#6892: fix optparse example involving help option.
........
................
Diffstat (limited to 'Lib/warnings.py')
| -rw-r--r-- | Lib/warnings.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/warnings.py b/Lib/warnings.py index b87d1be..5df3f49 100644 --- a/Lib/warnings.py +++ b/Lib/warnings.py @@ -29,7 +29,7 @@ def formatwarning(message, category, filename, lineno, line=None): return s def filterwarnings(action, message="", category=Warning, module="", lineno=0, - append=0): + append=False): """Insert an entry into the list of warnings filters (at the front). Use assertions to check that all arguments have the right type.""" @@ -49,7 +49,7 @@ def filterwarnings(action, message="", category=Warning, module="", lineno=0, else: filters.insert(0, item) -def simplefilter(action, category=Warning, lineno=0, append=0): +def simplefilter(action, category=Warning, lineno=0, append=False): """Insert a simple entry into the list of warnings filters (at the front). A simple filter matches all modules and messages. |