Mailman 3 January 2010 - Python-checkins

r77878 - in python/branches/release31-maint/Misc: NEWS python.man
by matthias.klose 31 Jan '10

31 Jan '10

Author: matthias.klose Date: Sun Jan 31 17:17:23 2010 New Revision: 77878 Log: Merged revisions 77877 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r77877 | matthias.klose | 2010-01-31 17:14:37 +0100 (So, 31 Jan 2010) | 10 lines Merged revisions 77875 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77875 | matthias.klose | 2010-01-31 17:05:13 +0100 (So, 31 Jan 2010) | 3 lines - Update python manual page (options -B, -O0, -s, environment variables PYTHONDONTWRITEBYTECODE, PYTHONNOUSERSITE). ........ ................ Modified: python/branches/release31-maint/Misc/NEWS python/branches/release31-maint/Misc/python.man Modified: python/branches/release31-maint/Misc/NEWS ============================================================================== --- python/branches/release31-maint/Misc/NEWS (original) +++ python/branches/release31-maint/Misc/NEWS Sun Jan 31 17:17:23 2010 @@ -368,6 +368,9 @@ - Issue #6556: Fixed the Distutils configuration files location explanation for Windows. +- Update python manual page (options -B, -O0, -s, environment variables + PYTHONDONTWRITEBYTECODE, PYTHONNOUSERSITE). + What's New in Python 3.1.1? =========================== @@ -421,7 +424,7 @@ occur when writing to a BufferedRandom object (e.g. a file opened in "rb+" or "wb+" mode) after having buffered a certain amount of data for reading. This bug was not present in the pure Python implementation. - + - Issue #6622: Fix "local variable 'secret' referenced before assignment" bug in POP3.apop. Modified: python/branches/release31-maint/Misc/python.man ============================================================================== --- python/branches/release31-maint/Misc/python.man (original) +++ python/branches/release31-maint/Misc/python.man Sun Jan 31 17:17:23 2010 @@ -8,6 +8,9 @@ .SH SYNOPSIS .B python [ +.B \-B +] +[ .B \-d ] [ @@ -23,15 +26,21 @@ .B \-m .I module-name ] -[ -.B \-O -] .br [ +.B \-O +] +[ +.B \-O0 +] +[ .B -Q .I argument ] [ +.B \-s +] +[ .B \-S ] [ @@ -51,6 +60,9 @@ [ .B \-x ] +[ +.B \-? +] .br [ .B \-c @@ -89,6 +101,11 @@ program. .SH COMMAND LINE OPTIONS .TP +.B \-B +Don't write +.I .py[co] +files on import. See also PYTHONDONTWRITEBYTECODE. +.TP .BI "\-c " command Specify the command to execute (see next section). This terminates the option list (following options are passed as @@ -102,7 +119,7 @@ Ignore environment variables like PYTHONPATH and PYTHONHOME that modify the behavior of the interpreter. .TP -.B \-h +.B \-h ", " \-? ", "\-\-help Prints the usage for the interpreter executable and exits. .TP .B \-i @@ -125,6 +142,9 @@ .I .pyc to \fI.pyo\fP. Given twice, causes docstrings to be discarded. .TP +.B \-O0 +Discard docstrings in addition to the \fB-O\fP optimizations. +.TP .BI "\-Q " argument Division control; see PEP 238. The argument must be one of "old" (the default, int/int and long/long return an int or long), "new" (new @@ -134,6 +154,9 @@ all use of the division operator). For a use of "warnall", see the Tools/scripts/fixdiv.py script. .TP +.B \-s +Don't add user site directory to sys.path. +.TP .B \-S Disable the import of the module .I site @@ -156,7 +179,7 @@ searching for a module. Also provides information on module cleanup at exit. .TP -.B \-V +.B \-V ", " \-\-version Prints the Python version number of the executable and exits. .TP .BI "\-W " argument @@ -353,9 +376,17 @@ If this is set to a non-empty string it is equivalent to specifying the \fB\-d\fP option. If set to an integer, it is equivalent to specifying \fB\-d\fP multiple times. +.IP PYTHONDONTWRITEBYTECODE +If this is set to a non-empty string it is equivalent to specifying +the \fB\-B\fP option (don't try to write +.I .py[co] +files). .IP PYTHONINSPECT If this is set to a non-empty string it is equivalent to specifying the \fB\-i\fP option. +.IP PYTHONNOUSERSITE +If this is set to a non-empty string it is equivalent to specifying +the \fB\-s\fP option (Don't add the user site directory to sys.path). .IP PYTHONUNBUFFERED If this is set to a non-empty string it is equivalent to specifying the \fB\-u\fP option.

1 0

r77877 - in python/branches/py3k: Misc/NEWS Misc/python.man
by matthias.klose 31 Jan '10

31 Jan '10

Author: matthias.klose Date: Sun Jan 31 17:14:37 2010 New Revision: 77877 Log: Merged revisions 77875 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77875 | matthias.klose | 2010-01-31 17:05:13 +0100 (So, 31 Jan 2010) | 3 lines - Update python manual page (options -B, -O0, -s, environment variables PYTHONDONTWRITEBYTECODE, PYTHONNOUSERSITE). ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Misc/NEWS python/branches/py3k/Misc/python.man Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Sun Jan 31 17:14:37 2010 @@ -693,6 +693,9 @@ - Issue #6556: Fixed the Distutils configuration files location explanation for Windows. + +- Update python manual page (options -B, -O0, -s, environment variables + PYTHONDONTWRITEBYTECODE, PYTHONNOUSERSITE). Tests ----- Modified: python/branches/py3k/Misc/python.man ============================================================================== --- python/branches/py3k/Misc/python.man (original) +++ python/branches/py3k/Misc/python.man Sun Jan 31 17:14:37 2010 @@ -8,6 +8,9 @@ .SH SYNOPSIS .B python [ +.B \-B +] +[ .B \-d ] [ @@ -23,15 +26,21 @@ .B \-m .I module-name ] -[ -.B \-O -] .br [ +.B \-O +] +[ +.B \-O0 +] +[ .B -Q .I argument ] [ +.B \-s +] +[ .B \-S ] [ @@ -51,6 +60,9 @@ [ .B \-x ] +[ +.B \-? +] .br [ .B \-c @@ -89,6 +101,11 @@ program. .SH COMMAND LINE OPTIONS .TP +.B \-B +Don't write +.I .py[co] +files on import. See also PYTHONDONTWRITEBYTECODE. +.TP .BI "\-c " command Specify the command to execute (see next section). This terminates the option list (following options are passed as @@ -102,7 +119,7 @@ Ignore environment variables like PYTHONPATH and PYTHONHOME that modify the behavior of the interpreter. .TP -.B \-h +.B \-h ", " \-? ", "\-\-help Prints the usage for the interpreter executable and exits. .TP .B \-i @@ -125,6 +142,9 @@ .I .pyc to \fI.pyo\fP. Given twice, causes docstrings to be discarded. .TP +.B \-O0 +Discard docstrings in addition to the \fB-O\fP optimizations. +.TP .BI "\-Q " argument Division control; see PEP 238. The argument must be one of "old" (the default, int/int and long/long return an int or long), "new" (new @@ -134,6 +154,9 @@ all use of the division operator). For a use of "warnall", see the Tools/scripts/fixdiv.py script. .TP +.B \-s +Don't add user site directory to sys.path. +.TP .B \-S Disable the import of the module .I site @@ -156,7 +179,7 @@ searching for a module. Also provides information on module cleanup at exit. .TP -.B \-V +.B \-V ", " \-\-version Prints the Python version number of the executable and exits. .TP .BI "\-W " argument @@ -353,9 +376,17 @@ If this is set to a non-empty string it is equivalent to specifying the \fB\-d\fP option. If set to an integer, it is equivalent to specifying \fB\-d\fP multiple times. +.IP PYTHONDONTWRITEBYTECODE +If this is set to a non-empty string it is equivalent to specifying +the \fB\-B\fP option (don't try to write +.I .py[co] +files). .IP PYTHONINSPECT If this is set to a non-empty string it is equivalent to specifying the \fB\-i\fP option. +.IP PYTHONNOUSERSITE +If this is set to a non-empty string it is equivalent to specifying +the \fB\-s\fP option (Don't add the user site directory to sys.path). .IP PYTHONUNBUFFERED If this is set to a non-empty string it is equivalent to specifying the \fB\-u\fP option.

1 0

r77876 - in python/branches/release26-maint: Misc/NEWS Misc/python.man
by matthias.klose 31 Jan '10

31 Jan '10

Author: matthias.klose Date: Sun Jan 31 17:09:16 2010 New Revision: 77876 Log: Merged revisions 77875 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77875 | matthias.klose | 2010-01-31 17:05:13 +0100 (So, 31 Jan 2010) | 3 lines - Update python manual page (options -B, -O0, -s, environment variables PYTHONDONTWRITEBYTECODE, PYTHONNOUSERSITE). ........ Modified: python/branches/release26-maint/ (props changed) python/branches/release26-maint/Misc/NEWS python/branches/release26-maint/Misc/python.man Modified: python/branches/release26-maint/Misc/NEWS ============================================================================== --- python/branches/release26-maint/Misc/NEWS (original) +++ python/branches/release26-maint/Misc/NEWS Sun Jan 31 17:09:16 2010 @@ -213,6 +213,11 @@ - Issue #7541: when using ``python-config`` with a framework install the compiler might use the wrong library. +Documentation +------------- + +- Update python manual page (options -B, -O0, -s, environment variables + PYTHONDONTWRITEBYTECODE, PYTHONNOUSERSITE). Tests ----- Modified: python/branches/release26-maint/Misc/python.man ============================================================================== --- python/branches/release26-maint/Misc/python.man (original) +++ python/branches/release26-maint/Misc/python.man Sun Jan 31 17:09:16 2010 @@ -8,6 +8,9 @@ .SH SYNOPSIS .B python [ +.B \-B +] +[ .B \-d ] [ @@ -23,15 +26,21 @@ .B \-m .I module-name ] -[ -.B \-O -] .br [ +.B \-O +] +[ +.B \-O0 +] +[ .B -Q .I argument ] [ +.B \-s +] +[ .B \-S ] [ @@ -57,6 +66,9 @@ [ .B \-3 ] +[ +.B \-? +] .br [ .B \-c @@ -95,6 +107,11 @@ program. .SH COMMAND LINE OPTIONS .TP +.B \-B +Don't write +.I .py[co] +files on import. See also PYTHONDONTWRITEBYTECODE. +.TP .BI "\-c " command Specify the command to execute (see next section). This terminates the option list (following options are passed as @@ -108,7 +125,7 @@ Ignore environment variables like PYTHONPATH and PYTHONHOME that modify the behavior of the interpreter. .TP -.B \-h +.B \-h ", " \-? ", "\-\-help Prints the usage for the interpreter executable and exits. .TP .B \-i @@ -131,6 +148,9 @@ .I .pyc to \fI.pyo\fP. Given twice, causes docstrings to be discarded. .TP +.B \-O0 +Discard docstrings in addition to the \fB-O\fP optimizations. +.TP .BI "\-Q " argument Division control; see PEP 238. The argument must be one of "old" (the default, int/int and long/long return an int or long), "new" (new @@ -140,6 +160,9 @@ all use of the division operator). For a use of "warnall", see the Tools/scripts/fixdiv.py script. .TP +.B \-s +Don't add user site directory to sys.path. +.TP .B \-S Disable the import of the module .I site @@ -167,7 +190,7 @@ searching for a module. Also provides information on module cleanup at exit. .TP -.B \-V +.B \-V ", " \-\-version Prints the Python version number of the executable and exits. .TP .BI "\-W " argument @@ -370,9 +393,17 @@ If this is set to a non-empty string it is equivalent to specifying the \fB\-d\fP option. If set to an integer, it is equivalent to specifying \fB\-d\fP multiple times. +.IP PYTHONDONTWRITEBYTECODE +If this is set to a non-empty string it is equivalent to specifying +the \fB\-B\fP option (don't try to write +.I .py[co] +files). .IP PYTHONINSPECT If this is set to a non-empty string it is equivalent to specifying the \fB\-i\fP option. +.IP PYTHONNOUSERSITE +If this is set to a non-empty string it is equivalent to specifying +the \fB\-s\fP option (Don't add the user site directory to sys.path). .IP PYTHONUNBUFFERED If this is set to a non-empty string it is equivalent to specifying the \fB\-u\fP option.

1 0

r77875 - in python/trunk/Misc: NEWS python.man
by matthias.klose 31 Jan '10

31 Jan '10

Author: matthias.klose Date: Sun Jan 31 17:05:13 2010 New Revision: 77875 Log: - Update python manual page (options -B, -O0, -s, environment variables PYTHONDONTWRITEBYTECODE, PYTHONNOUSERSITE). Modified: python/trunk/Misc/NEWS python/trunk/Misc/python.man Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Sun Jan 31 17:05:13 2010 @@ -123,6 +123,12 @@ added to the `Tools/` directory. They were previously living in the sandbox. +Documentation +------------- + +- Update python manual page (options -B, -O0, -s, environment variables + PYTHONDONTWRITEBYTECODE, PYTHONNOUSERSITE). + What's New in Python 2.7 alpha 2? ================================= Modified: python/trunk/Misc/python.man ============================================================================== --- python/trunk/Misc/python.man (original) +++ python/trunk/Misc/python.man Sun Jan 31 17:05:13 2010 @@ -8,6 +8,9 @@ .SH SYNOPSIS .B python [ +.B \-B +] +[ .B \-d ] [ @@ -23,15 +26,21 @@ .B \-m .I module-name ] -[ -.B \-O -] .br [ +.B \-O +] +[ +.B \-O0 +] +[ .B -Q .I argument ] [ +.B \-s +] +[ .B \-S ] [ @@ -57,6 +66,9 @@ [ .B \-3 ] +[ +.B \-? +] .br [ .B \-c @@ -95,6 +107,11 @@ program. .SH COMMAND LINE OPTIONS .TP +.B \-B +Don't write +.I .py[co] +files on import. See also PYTHONDONTWRITEBYTECODE. +.TP .BI "\-c " command Specify the command to execute (see next section). This terminates the option list (following options are passed as @@ -108,7 +125,7 @@ Ignore environment variables like PYTHONPATH and PYTHONHOME that modify the behavior of the interpreter. .TP -.B \-h +.B \-h ", " \-? ", "\-\-help Prints the usage for the interpreter executable and exits. .TP .B \-i @@ -131,6 +148,9 @@ .I .pyc to \fI.pyo\fP. Given twice, causes docstrings to be discarded. .TP +.B \-O0 +Discard docstrings in addition to the \fB-O\fP optimizations. +.TP .BI "\-Q " argument Division control; see PEP 238. The argument must be one of "old" (the default, int/int and long/long return an int or long), "new" (new @@ -140,6 +160,9 @@ all use of the division operator). For a use of "warnall", see the Tools/scripts/fixdiv.py script. .TP +.B \-s +Don't add user site directory to sys.path. +.TP .B \-S Disable the import of the module .I site @@ -167,7 +190,7 @@ searching for a module. Also provides information on module cleanup at exit. .TP -.B \-V +.B \-V ", " \-\-version Prints the Python version number of the executable and exits. .TP .BI "\-W " argument @@ -370,9 +393,17 @@ If this is set to a non-empty string it is equivalent to specifying the \fB\-d\fP option. If set to an integer, it is equivalent to specifying \fB\-d\fP multiple times. +.IP PYTHONDONTWRITEBYTECODE +If this is set to a non-empty string it is equivalent to specifying +the \fB\-B\fP option (don't try to write +.I .py[co] +files). .IP PYTHONINSPECT If this is set to a non-empty string it is equivalent to specifying the \fB\-i\fP option. +.IP PYTHONNOUSERSITE +If this is set to a non-empty string it is equivalent to specifying +the \fB\-s\fP option (Don't add the user site directory to sys.path). .IP PYTHONUNBUFFERED If this is set to a non-empty string it is equivalent to specifying the \fB\-u\fP option.

1 0

r77874 - in python/branches/release25-maint: Include/patchlevel.h Misc/NEWS
by martin.v.loewis 31 Jan '10

31 Jan '10

Author: martin.v.loewis Date: Sun Jan 31 17:00:16 2010 New Revision: 77874 Log: Post 2.5.5. Modified: python/branches/release25-maint/Include/patchlevel.h python/branches/release25-maint/Misc/NEWS Modified: python/branches/release25-maint/Include/patchlevel.h ============================================================================== --- python/branches/release25-maint/Include/patchlevel.h (original) +++ python/branches/release25-maint/Include/patchlevel.h Sun Jan 31 17:00:16 2010 @@ -21,12 +21,12 @@ /* Version parsed out into numeric values */ #define PY_MAJOR_VERSION 2 #define PY_MINOR_VERSION 5 -#define PY_MICRO_VERSION 5 -#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL +#define PY_MICRO_VERSION 6 +#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_ALPHA #define PY_RELEASE_SERIAL 0 /* Version as a string */ -#define PY_VERSION "2.5.5" +#define PY_VERSION "2.5.5+" /* Subversion Revision number of this file (not of the repository) */ #define PY_PATCHLEVEL_REVISION "$Revision$" Modified: python/branches/release25-maint/Misc/NEWS ============================================================================== --- python/branches/release25-maint/Misc/NEWS (original) +++ python/branches/release25-maint/Misc/NEWS Sun Jan 31 17:00:16 2010 @@ -4,6 +4,12 @@ (editors: check NEWS.help for information about editing NEWS using ReST.) +What's New in Python 2.5.6c1? +============================= + +*Release date: XX-XXX-2010* + + What's New in Python 2.5.5? ===========================

1 0

r77873 - python/tags/r255
by martin.v.loewis 31 Jan '10

31 Jan '10

Author: martin.v.loewis Date: Sun Jan 31 13:39:06 2010 New Revision: 77873 Log: Tagging for release of Python 2.5.5 Added: python/tags/r255/ - copied from r77872, /python/branches/release25-maint/

1 0

r77872 - in python/branches/release25-maint: Include/patchlevel.h Lib/idlelib/NEWS.txt Lib/idlelib/idlever.py Misc/NEWS README
by martin.v.loewis 31 Jan '10

31 Jan '10

Author: martin.v.loewis Date: Sun Jan 31 13:38:29 2010 New Revision: 77872 Log: Prepare for 2.5.5. Modified: python/branches/release25-maint/Include/patchlevel.h python/branches/release25-maint/Lib/idlelib/NEWS.txt python/branches/release25-maint/Lib/idlelib/idlever.py python/branches/release25-maint/Misc/NEWS python/branches/release25-maint/README Modified: python/branches/release25-maint/Include/patchlevel.h ============================================================================== --- python/branches/release25-maint/Include/patchlevel.h (original) +++ python/branches/release25-maint/Include/patchlevel.h Sun Jan 31 13:38:29 2010 @@ -22,11 +22,11 @@ #define PY_MAJOR_VERSION 2 #define PY_MINOR_VERSION 5 #define PY_MICRO_VERSION 5 -#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_GAMMA -#define PY_RELEASE_SERIAL 2 +#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL +#define PY_RELEASE_SERIAL 0 /* Version as a string */ -#define PY_VERSION "2.5.5c2" +#define PY_VERSION "2.5.5" /* Subversion Revision number of this file (not of the repository) */ #define PY_PATCHLEVEL_REVISION "$Revision$" Modified: python/branches/release25-maint/Lib/idlelib/NEWS.txt ============================================================================== --- python/branches/release25-maint/Lib/idlelib/NEWS.txt (original) +++ python/branches/release25-maint/Lib/idlelib/NEWS.txt Sun Jan 31 13:38:29 2010 @@ -1,10 +1,15 @@ -What's New in IDLE 1.2.5c2? +What's New in IDLE 1.2.5? ========================= *Release date: 24-Jan-2010* +What's New in IDLE 1.2.5c2? +=========================== + +*Release date: 24-Jan-2010* + What's New in IDLE 1.2.5c1? -========================= +=========================== *Release date: 14-Jan-2010* Modified: python/branches/release25-maint/Lib/idlelib/idlever.py ============================================================================== --- python/branches/release25-maint/Lib/idlelib/idlever.py (original) +++ python/branches/release25-maint/Lib/idlelib/idlever.py Sun Jan 31 13:38:29 2010 @@ -1 +1 @@ -IDLE_VERSION = "1.2.5c2" +IDLE_VERSION = "1.2.5" Modified: python/branches/release25-maint/Misc/NEWS ============================================================================== --- python/branches/release25-maint/Misc/NEWS (original) +++ python/branches/release25-maint/Misc/NEWS Sun Jan 31 13:38:29 2010 @@ -4,6 +4,12 @@ (editors: check NEWS.help for information about editing NEWS using ReST.) +What's New in Python 2.5.5? +=========================== + +*Release date: 31-Jan-2010* + + What's New in Python 2.5.5c2? ============================= Modified: python/branches/release25-maint/README ============================================================================== --- python/branches/release25-maint/README (original) +++ python/branches/release25-maint/README Sun Jan 31 13:38:29 2010 @@ -1,5 +1,5 @@ -This is Python version 2.5.5c2 -============================== +This is Python version 2.5.5 +============================ Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Python Software Foundation.

1 0

r77871 - in python/trunk/Lib: cgi.py test/test_cgi.py test/test_coercion.py test/test_distutils.py test/test_userstring.py
by ezio.melotti 31 Jan '10

31 Jan '10

Author: ezio.melotti Date: Sun Jan 31 12:46:54 2010 New Revision: 77871 Log: #7092: silence more -3 and -Wd warnings Modified: python/trunk/Lib/cgi.py python/trunk/Lib/test/test_cgi.py python/trunk/Lib/test/test_coercion.py python/trunk/Lib/test/test_distutils.py python/trunk/Lib/test/test_userstring.py Modified: python/trunk/Lib/cgi.py ============================================================================== --- python/trunk/Lib/cgi.py (original) +++ python/trunk/Lib/cgi.py Sun Jan 31 12:46:54 2010 @@ -172,7 +172,7 @@ else: qs = "" environ['QUERY_STRING'] = qs # XXX Shouldn't, really - return parse_qs(qs, keep_blank_values, strict_parsing) + return urlparse.parse_qs(qs, keep_blank_values, strict_parsing) # parse query string function called from urlparse, Modified: python/trunk/Lib/test/test_cgi.py ============================================================================== --- python/trunk/Lib/test/test_cgi.py (original) +++ python/trunk/Lib/test/test_cgi.py Sun Jan 31 12:46:54 2010 @@ -1,4 +1,4 @@ -from test.test_support import run_unittest +from test.test_support import run_unittest, check_warnings import cgi import os import sys @@ -102,11 +102,6 @@ }) ] -def norm(list): - if type(list) == type([]): - list.sort() - return list - def first_elts(list): return map(lambda x:x[0], list) @@ -141,18 +136,18 @@ if type(expect) == type({}): # test dict interface self.assertEqual(len(expect), len(fcd)) - self.assertEqual(norm(expect.keys()), norm(fcd.keys())) - self.assertEqual(norm(expect.values()), norm(fcd.values())) - self.assertEqual(norm(expect.items()), norm(fcd.items())) + self.assertSameElements(expect.keys(), fcd.keys()) + self.assertSameElements(expect.values(), fcd.values()) + self.assertSameElements(expect.items(), fcd.items()) self.assertEqual(fcd.get("nonexistent field", "default"), "default") self.assertEqual(len(sd), len(fs)) - self.assertEqual(norm(sd.keys()), norm(fs.keys())) + self.assertSameElements(sd.keys(), fs.keys()) self.assertEqual(fs.getvalue("nonexistent field", "default"), "default") # test individual fields for key in expect.keys(): expect_val = expect[key] self.assertTrue(fcd.has_key(key)) - self.assertEqual(norm(fcd[key]), norm(expect[key])) + self.assertSameElements(fcd[key], expect[key]) self.assertEqual(fcd.get(key, "default"), fcd[key]) self.assertTrue(fs.has_key(key)) if len(expect_val) > 1: @@ -168,12 +163,12 @@ self.assertTrue(single_value) self.assertEqual(val, expect_val[0]) self.assertEqual(fs.getvalue(key), expect_val[0]) - self.assertEqual(norm(sd.getlist(key)), norm(expect_val)) + self.assertSameElements(sd.getlist(key), expect_val) if single_value: - self.assertEqual(norm(sd.values()), - first_elts(norm(expect.values()))) - self.assertEqual(norm(sd.items()), - first_second_elts(norm(expect.items()))) + self.assertSameElements(sd.values(), + first_elts(expect.values())) + self.assertSameElements(sd.items(), + first_second_elts(expect.items())) def test_weird_formcontentdict(self): # Test the weird FormContentDict classes @@ -184,7 +179,7 @@ self.assertEqual(d[k], v) for k, v in d.items(): self.assertEqual(expect[k], v) - self.assertEqual(norm(expect.values()), norm(d.values())) + self.assertSameElements(expect.values(), d.values()) def test_log(self): cgi.log("Testing") @@ -345,14 +340,16 @@ self.assertEqual(result, v) def test_deprecated_parse_qs(self): - # this func is moved to urlparse, this is just a sanity check - self.assertEqual({'a': ['A1'], 'B': ['B3'], 'b': ['B2']}, - cgi.parse_qs('a=A1&b=B2&B=B3')) + with check_warnings(): + # this func is moved to urlparse, this is just a sanity check + self.assertEqual({'a': ['A1'], 'B': ['B3'], 'b': ['B2']}, + cgi.parse_qs('a=A1&b=B2&B=B3')) def test_deprecated_parse_qsl(self): - # this func is moved to urlparse, this is just a sanity check - self.assertEqual([('a', 'A1'), ('b', 'B2'), ('B', 'B3')], - cgi.parse_qsl('a=A1&b=B2&B=B3')) + with check_warnings(): + # this func is moved to urlparse, this is just a sanity check + self.assertEqual([('a', 'A1'), ('b', 'B2'), ('B', 'B3')], + cgi.parse_qsl('a=A1&b=B2&B=B3')) def test_parse_header(self): self.assertEqual( Modified: python/trunk/Lib/test/test_coercion.py ============================================================================== --- python/trunk/Lib/test/test_coercion.py (original) +++ python/trunk/Lib/test/test_coercion.py Sun Jan 31 12:46:54 2010 @@ -223,8 +223,10 @@ infix_results[key] = res - -process_infix_results() +with warnings.catch_warnings(): + warnings.filterwarnings("ignore", "classic int division", + DeprecationWarning) + process_infix_results() # now infix_results has two lists of results for every pairing. prefix_binops = [ 'divmod' ] @@ -337,11 +339,12 @@ raise exc def test_main(): - warnings.filterwarnings("ignore", - r'complex divmod, // and % are deprecated', - DeprecationWarning, - r'test.test_coercion$') - run_unittest(CoercionTest) + with warnings.catch_warnings(): + warnings.filterwarnings("ignore", "complex divmod.., // and % " + "are deprecated", DeprecationWarning) + warnings.filterwarnings("ignore", "classic (int|long) division", + DeprecationWarning) + run_unittest(CoercionTest) if __name__ == "__main__": test_main() Modified: python/trunk/Lib/test/test_distutils.py ============================================================================== --- python/trunk/Lib/test/test_distutils.py (original) +++ python/trunk/Lib/test/test_distutils.py Sun Jan 31 12:46:54 2010 @@ -7,10 +7,15 @@ import distutils.tests import test.test_support +import warnings def test_main(): - test.test_support.run_unittest(distutils.tests.test_suite()) + with warnings.catch_warnings(): + warnings.filterwarnings("ignore", + "distutils.sysconfig.\w+ is deprecated", + DeprecationWarning) + test.test_support.run_unittest(distutils.tests.test_suite()) test.test_support.reap_children() Modified: python/trunk/Lib/test/test_userstring.py ============================================================================== --- python/trunk/Lib/test/test_userstring.py (original) +++ python/trunk/Lib/test/test_userstring.py Sun Jan 31 12:46:54 2010 @@ -136,7 +136,10 @@ def test_main(): with warnings.catch_warnings(): - warnings.filterwarnings("ignore", ".*MutableString", + warnings.filterwarnings("ignore", ".*MutableString has been removed", + DeprecationWarning) + warnings.filterwarnings("ignore", + ".*__(get|set|del)slice__ has been removed", DeprecationWarning) test_support.run_unittest(UserStringTest, MutableStringTest)

1 0

r77870 - in sandbox/trunk/2to3/lib2to3/fixes: fix_import.py fix_itertools_imports.py fix_xrange.py
by benjamin.peterson 31 Jan '10

31 Jan '10

Author: benjamin.peterson Date: Sun Jan 31 02:21:26 2010 New Revision: 77870 Log: never return the original node given to transform() Modified: sandbox/trunk/2to3/lib2to3/fixes/fix_import.py sandbox/trunk/2to3/lib2to3/fixes/fix_itertools_imports.py sandbox/trunk/2to3/lib2to3/fixes/fix_xrange.py Modified: sandbox/trunk/2to3/lib2to3/fixes/fix_import.py ============================================================================== --- sandbox/trunk/2to3/lib2to3/fixes/fix_import.py (original) +++ sandbox/trunk/2to3/lib2to3/fixes/fix_import.py Sun Jan 31 02:21:26 2010 @@ -56,7 +56,6 @@ if self.probably_a_local_import(imp.value): imp.value = u"." + imp.value imp.changed() - return node else: have_local = False have_absolute = False Modified: sandbox/trunk/2to3/lib2to3/fixes/fix_itertools_imports.py ============================================================================== --- sandbox/trunk/2to3/lib2to3/fixes/fix_itertools_imports.py (original) +++ sandbox/trunk/2to3/lib2to3/fixes/fix_itertools_imports.py Sun Jan 31 02:21:26 2010 @@ -49,4 +49,4 @@ p = node.prefix node = BlankLine() node.prefix = p - return node + return node Modified: sandbox/trunk/2to3/lib2to3/fixes/fix_xrange.py ============================================================================== --- sandbox/trunk/2to3/lib2to3/fixes/fix_xrange.py (original) +++ sandbox/trunk/2to3/lib2to3/fixes/fix_xrange.py Sun Jan 31 02:21:26 2010 @@ -40,7 +40,6 @@ for n in results["rest"]: list_call.append_child(n) return list_call - return node P1 = "power< func=NAME trailer< '(' node=any ')' > any* >" p1 = patcomp.compile_pattern(P1)

1 0

r77869 - peps/trunk/pep-3147.txt
by barry.warsaw 31 Jan '10

31 Jan '10

Author: barry.warsaw Date: Sun Jan 31 01:38:55 2010 New Revision: 77869 Log: Oops, one more. Modified: peps/trunk/pep-3147.txt Modified: peps/trunk/pep-3147.txt ============================================================================== --- peps/trunk/pep-3147.txt (original) +++ peps/trunk/pep-3147.txt Sun Jan 31 01:38:55 2010 @@ -212,7 +212,7 @@ >>> baz.__file__ 'baz/__init__.pyc' -The implementation of PEP 999 would have to ensure that the same +The implementation of this PEP would have to ensure that the same directory level is returned from `__file__` as it does without the `pyr` directory, so that the common idiom above continues to work::

1 0