Mailman 3 June 2005 - Python-checkins

python/dist/src/Lib warnings.py,1.26,1.27
by birkenfeld＠users.sourceforge.net 26 Jun '05

26 Jun '05

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31176/Lib Modified Files: warnings.py Log Message: bug [ 839151 ] attempt to access sys.argv when it doesn't exist Index: warnings.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/warnings.py,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- warnings.py 6 Feb 2005 06:57:08 -0000 1.26 +++ warnings.py 26 Jun 2005 22:53:29 -0000 1.27 @@ -50,7 +50,11 @@ filename = filename[:-1] else: if module == "__main__": - filename = sys.argv[0] + try: + filename = sys.argv[0] + except AttributeError: + # embedded interpreters don't have sys.argv, see bug #839151 + filename = '__main__' if not filename: filename = module registry = globals.setdefault("__warningregistry__", {})

1 0

python/dist/src/Lib doctest.py, 1.120.2.1, 1.120.2.2
by birkenfeld＠users.sourceforge.net 26 Jun '05

26 Jun '05

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15362/Lib Modified Files: Tag: release24-maint doctest.py Log Message: backport bug [ 1172785 ] doctest.script_from_examples() result sometimes un-exec-able Index: doctest.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/doctest.py,v retrieving revision 1.120.2.1 retrieving revision 1.120.2.2 diff -u -d -r1.120.2.1 -r1.120.2.2 --- doctest.py 29 Mar 2005 12:35:54 -0000 1.120.2.1 +++ doctest.py 26 Jun 2005 22:23:44 -0000 1.120.2.2 @@ -2494,7 +2494,8 @@ while output and output[0] == '#': output.pop(0) # Combine the output, and return it. - return '\n'.join(output) + # Add a courtesy newline to prevent exec from choking (see bug #1172785) + return '\n'.join(output) + '\n' def testsource(module, name): """Extract the test sources from a doctest docstring as a script.

1 0

python/dist/src/Lib doctest.py,1.122,1.123
by birkenfeld＠users.sourceforge.net 26 Jun '05

26 Jun '05

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14574/Lib Modified Files: doctest.py Log Message: bug [ 1172785 ] doctest.script_from_examples() result sometimes un-exec-able Index: doctest.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/doctest.py,v retrieving revision 1.122 retrieving revision 1.123 diff -u -d -r1.122 -r1.123 --- doctest.py 28 Mar 2005 23:50:54 -0000 1.122 +++ doctest.py 26 Jun 2005 22:22:31 -0000 1.123 @@ -2498,7 +2498,8 @@ while output and output[0] == '#': output.pop(0) # Combine the output, and return it. - return '\n'.join(output) + # Add a courtesy newline to prevent exec from choking (see bug #1172785) + return '\n'.join(output) + '\n' def testsource(module, name): """Extract the test sources from a doctest docstring as a script.

1 0

python/dist/src/Misc NEWS, 1.1193.2.56, 1.1193.2.57
by birkenfeld＠users.sourceforge.net 26 Jun '05

26 Jun '05

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7420/Misc Modified Files: Tag: release24-maint NEWS Log Message: - Bug #1155638: Fix a bug which affected HTTP 0.9 responses in httplib. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1193.2.56 retrieving revision 1.1193.2.57 diff -u -d -r1.1193.2.56 -r1.1193.2.57 --- NEWS 26 Jun 2005 21:50:34 -0000 1.1193.2.56 +++ NEWS 26 Jun 2005 22:09:12 -0000 1.1193.2.57 @@ -39,6 +39,8 @@ Library ------- +- Bug #1155638: Fix a bug which affected HTTP 0.9 responses in httplib. + - Bug #1100201: Cross-site scripting was possible on BaseHTTPServer via error messages.

1 0

python/dist/src/Misc NEWS,1.1305,1.1306
by birkenfeld＠users.sourceforge.net 26 Jun '05

26 Jun '05

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7283/Misc Modified Files: NEWS Log Message: - Bug #1155638: Fix a bug which affected HTTP 0.9 responses in httplib. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1305 retrieving revision 1.1306 diff -u -d -r1.1305 -r1.1306 --- NEWS 26 Jun 2005 21:36:25 -0000 1.1305 +++ NEWS 26 Jun 2005 22:09:06 -0000 1.1306 @@ -147,6 +147,8 @@ Library ------- +- Bug #1155638: Fix a bug which affected HTTP 0.9 responses in httplib. + - Bug #1100201: Cross-site scripting was possible on BaseHTTPServer via error messages.

1 0

python/dist/src/Lib httplib.py,1.94,1.94.2.1
by birkenfeld＠users.sourceforge.net 26 Jun '05

26 Jun '05

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6280/Lib Modified Files: Tag: release24-maint httplib.py Log Message: backport bug [ 1155638 ] self.length shield exception in httplib Index: httplib.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/httplib.py,v retrieving revision 1.94 retrieving revision 1.94.2.1 diff -u -d -r1.94 -r1.94.2.1 --- httplib.py 7 Nov 2004 16:13:09 -0000 1.94 +++ httplib.py 26 Jun 2005 22:06:56 -0000 1.94.2.1 @@ -353,6 +353,7 @@ raise UnknownProtocol(version) if self.version == 9: + self.length = None self.chunked = 0 self.will_close = 1 self.msg = HTTPMessage(StringIO())

1 0

python/dist/src/Lib httplib.py,1.94,1.95
by birkenfeld＠users.sourceforge.net 26 Jun '05

26 Jun '05

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6274/Lib Modified Files: httplib.py Log Message: bug [ 1155638 ] self.length shield exception in httplib Index: httplib.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/httplib.py,v retrieving revision 1.94 retrieving revision 1.95 diff -u -d -r1.94 -r1.95 --- httplib.py 7 Nov 2004 16:13:09 -0000 1.94 +++ httplib.py 26 Jun 2005 22:06:54 -0000 1.95 @@ -353,6 +353,7 @@ raise UnknownProtocol(version) if self.version == 9: + self.length = None self.chunked = 0 self.will_close = 1 self.msg = HTTPMessage(StringIO())

1 0

python/dist/src/Lib urllib2.py,1.81,1.82
by birkenfeld＠users.sourceforge.net 26 Jun '05

26 Jun '05

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3820/Lib Modified Files: urllib2.py Log Message: bug [ 1175848 ] poorly named variable in urllib2.py Index: urllib2.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/urllib2.py,v retrieving revision 1.81 retrieving revision 1.82 diff -u -d -r1.81 -r1.82 --- urllib2.py 6 Feb 2005 06:57:08 -0000 1.81 +++ urllib2.py 26 Jun 2005 22:01:35 -0000 1.82 @@ -277,8 +277,8 @@ class OpenerDirector: def __init__(self): - server_version = "Python-urllib/%s" % __version__ - self.addheaders = [('User-agent', server_version)] + client_version = "Python-urllib/%s" % __version__ + self.addheaders = [('User-agent', client_version)] # manage the individual handlers self.handlers = [] self.handle_open = {}

1 0

python/dist/src/Lib cgitb.py,1.15,1.15.4.1
by birkenfeld＠users.sourceforge.net 26 Jun '05

26 Jun '05

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2907/Lib Modified Files: Tag: release24-maint cgitb.py Log Message: Backport: Prevent creating a HTML link to file://?/ Index: cgitb.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/cgitb.py,v retrieving revision 1.15 retrieving revision 1.15.4.1 diff -u -d -r1.15 -r1.15.4.1 --- cgitb.py 18 Jul 2004 06:14:41 -0000 1.15 +++ cgitb.py 26 Jun 2005 21:59:34 -0000 1.15.4.1 @@ -112,8 +112,11 @@ frames = [] records = inspect.getinnerframes(etb, context) for frame, file, lnum, func, lines, index in records: - file = file and os.path.abspath(file) or '?' - link = '<a href="file://%s">%s</a>' % (file, pydoc.html.escape(file)) + if file: + file = os.path.abspath(file) + link = '<a href="file://%s">%s</a>' % (file, pydoc.html.escape(file)) + else: + file = link = '?' args, varargs, varkw, locals = inspect.getargvalues(frame) call = '' if func != '?':

1 0

python/dist/src/Lib cgitb.py,1.16,1.17
by birkenfeld＠users.sourceforge.net 26 Jun '05

26 Jun '05

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1941/Lib Modified Files: cgitb.py Log Message: Prevent creating a HTML link to file://?/ Index: cgitb.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/cgitb.py,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- cgitb.py 6 Feb 2005 06:57:07 -0000 1.16 +++ cgitb.py 26 Jun 2005 21:57:55 -0000 1.17 @@ -112,8 +112,11 @@ frames = [] records = inspect.getinnerframes(etb, context) for frame, file, lnum, func, lines, index in records: - file = file and os.path.abspath(file) or '?' - link = '<a href="file://%s">%s</a>' % (file, pydoc.html.escape(file)) + if file: + file = os.path.abspath(file) + link = '<a href="file://%s">%s</a>' % (file, pydoc.html.escape(file)) + else: + file = link = '?' args, varargs, varkw, locals = inspect.getargvalues(frame) call = '' if func != '?':

1 0