Merged revisions 73447-73448 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73447 | georg.brandl | 2009-06-16 19:41:33 +0200 (Di, 16 Jun 2009) | 1 line

  Add tabularcolumns directive for tables with bullet lists in them.
........
  r73448 | georg.brandl | 2009-06-16 19:43:44 +0200 (Di, 16 Jun 2009) | 1 line

  Remove unused macro.
........

diff --git a/Doc/library/tkinter.ttk.rst b/Doc/library/tkinter.ttk.rst
index c11b08bca7c308932bbac1393c2e2f6144882558..3390d130e9e451c7261f8ee73ffd70f3922b027b 100644 (file)
--- a/Doc/library/tkinter.ttk.rst
+++ b/Doc/library/tkinter.ttk.rst
@@ -157,6 +157,9 @@ Label Options
 The following options are supported by labels, buttons and other button-like
 widgets.
 
+.. tabularcolumns:: |p{0.2\textwidth}|p{0.7\textwidth}|
+..
+
    +--------------+-----------------------------------------------------------+
    | option       | description                                               |
    +==============+===========================================================+
@@ -697,6 +700,9 @@ Options
 
 This widget accepts the following specific options:
 
+.. tabularcolumns:: |p{0.2\textwidth}|p{0.7\textwidth}|
+..
+
    +----------------+--------------------------------------------------------+
    | option         | description                                            |
    +================+========================================================+

diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index 9258ace50a10158d083eec7000a774ec42113a28..adaece1ef5b6324e51e301bb809bdc109e5097b0 100644 (file)
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -9,7 +9,6 @@
 #include "structmember.h"
 #include "osdefs.h"
 
-#define MAKE_IT_NONE(x) (x) = Py_None; Py_INCREF(Py_None);
 
 /* NOTE: If the exception class hierarchy changes, don't forget to update
  * Lib/test/exception_hierarchy.txt