[Python-checkins] r74387 - in python/branches/release31-maint: Include/abstract.h Lib/tkinter Lib/tkinter/test Lib/tkinter/test/test_ttk

Thu Aug 13 10:54:55 CEST 2009

Author: georg.brandl
Date: Thu Aug 13 10:54:55 2009
New Revision: 74387
Log:
Merged revisions 73735-73736 via svnmerge from 
svn+ssh://svn.python.org/python/branches/py3k
........
 r73735 | benjamin.peterson | 2009年07月01日 03:45:12 +0200 (Mi, 01 Jul 2009) | 1 line
 
 remove comment about PyNumber_Int
........
 r73736 | hirokazu.yamamoto | 2009年07月01日 04:24:13 +0200 (Mi, 01 Jul 2009) | 1 line
 
 Added svn:ignore.
........
Modified:
 python/branches/release31-maint/ (props changed)
 python/branches/release31-maint/Include/abstract.h
 python/branches/release31-maint/Lib/tkinter/ (props changed)
 python/branches/release31-maint/Lib/tkinter/test/ (props changed)
 python/branches/release31-maint/Lib/tkinter/test/test_ttk/ (props changed)
Modified: python/branches/release31-maint/Include/abstract.h
==============================================================================

--- python/branches/release31-maint/Include/abstract.h	(original)
+++ python/branches/release31-maint/Include/abstract.h	Thu Aug 13 10:54:55 2009
@@ -777,12 +777,6 @@
 is cleared and the value is clipped. 
 */
 
- /*
- PyNumber_Int used to be found here. It's now in Include/intobject.h,
- where it is defined to be an alias for PyNumber_Long. New code
- should use PyNumber_Long instead.
- */
-
 PyAPI_FUNC(PyObject *) PyNumber_Long(PyObject *o);
 
 /*
