]> granicus.if.org Git - python/commit
Merged revisions 62774-62775,62785,62787-62788 via svnmerge from
authorChristian Heimes <christian@cheimes.de>
Tue, 6 May 2008 23:45:46 +0000 (23:45 +0000)
committerChristian Heimes <christian@cheimes.de>
Tue, 6 May 2008 23:45:46 +0000 (23:45 +0000)
commit8dc226fccd2183670ac19a85b89941f5b05167dc
treea02b3f53c54d1e18139d53de40954828350fabcb
parent1bf7108fd515af1b537dcbf738c3cb488af5ab0d
Merged revisions 62774-62775,62785,62787-62788 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62774 | georg.brandl | 2008-05-06 19:11:42 +0200 (Tue, 06 May 2008) | 2 lines

  #2773: fix description of 'g' and 'G' formatting spec.
........
  r62775 | georg.brandl | 2008-05-06 19:20:54 +0200 (Tue, 06 May 2008) | 2 lines

  > != (!<).
........
  r62785 | benjamin.peterson | 2008-05-07 00:18:11 +0200 (Wed, 07 May 2008) | 2 lines

  Fix logic error in Python/_warnings.c and add a test to verify
........
  r62787 | benjamin.peterson | 2008-05-07 00:31:52 +0200 (Wed, 07 May 2008) | 2 lines

  Make the Python implementation of warnings compatible with the C implementation regarding non-callable showwarning
........
  r62788 | christian.heimes | 2008-05-07 00:41:46 +0200 (Wed, 07 May 2008) | 1 line

  Implemented PEP 370
........
13 files changed:
Doc/library/site.rst
Doc/library/stdtypes.rst
Doc/using/cmdline.rst
Include/pydebug.h
Lib/distutils/command/install.py
Lib/site.py
Lib/test/test_site.py
Lib/test/test_warnings.py
Lib/warnings.py
Modules/main.c
Python/_warnings.c
Python/pythonrun.c
Python/sysmodule.c