Recorded merge of revisions 81032 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r81032 | antoine.pitrou | 2010-05-09 17:52:27 +0200 (dim., 09 mai 2010) | 9 lines

  Recorded merge of revisions 81029 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines

    Untabify C files. Will watch buildbots.
  ........
................

Modules/_ctypes/_ctypes.c

@@ -98,7 +98,7 @@ bytes(cdata)
  * PyCField_Type
  *
  */
-
+
 #define PY_SSIZE_T_CLEAN
 
 #include "Python.h"
@@ -135,7 +135,7 @@ static PyObject *_unpickle;
 char *_ctypes_conversion_encoding = NULL;
 char *_ctypes_conversion_errors = NULL;
 
-
+
 /****************************************************************/
 
 typedef struct {
@@ -789,7 +789,7 @@ static PyTypeObject UnionType_Type = {
     0,                                          /* tp_free */
 };
 
-
+
 /******************************************************************/
 
 /*
@@ -1025,7 +1025,7 @@ PyTypeObject PyCPointerType_Type = {
     0,                                          /* tp_free */
 };
 
-
+
 /******************************************************************/
 /*
   PyCArrayType_Type
@@ -1427,7 +1427,7 @@ PyTypeObject PyCArrayType_Type = {
     0,                                          /* tp_free */
 };
 
-
+
 /******************************************************************/
 /*
   PyCSimpleType_Type
@@ -2314,7 +2314,7 @@ PyTypeObject PyCFuncPtrType_Type = {
     0,                                          /* tp_free */
 };
 
-
+
 /*****************************************************************
  * Code to keep needed objects alive
  */
@@ -2845,7 +2845,7 @@ PyCData_set(PyObject *dst, PyObject *type, SETFUNC setfunc, PyObject *value,
     return KeepRef(mem, index, result);
 }
 
-
+
 /******************************************************************/
 static PyObject *
 GenericPyCData_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
@@ -3926,7 +3926,7 @@ PyTypeObject PyCFuncPtr_Type = {
     PyCFuncPtr_new,                             /* tp_new */
     0,                                          /* tp_free */
 };
-
+
 /*****************************************************************/
 /*
   Struct_Type
@@ -4116,7 +4116,7 @@ static PyTypeObject Union_Type = {
     0,                                          /* tp_free */
 };
 
-
+
 /******************************************************************/
 /*
   PyCArray_Type
@@ -4488,7 +4488,7 @@ PyCArrayType_from_ctype(PyObject *itemtype, Py_ssize_t length)
     return result;
 }
 
-
+
 /******************************************************************/
 /*
   Simple_Type
@@ -4656,7 +4656,7 @@ static PyTypeObject Simple_Type = {
     GenericPyCData_new,                         /* tp_new */
     0,                                          /* tp_free */
 };
-
+
 /******************************************************************/
 /*
   PyCPointer_Type
@@ -5034,7 +5034,7 @@ PyTypeObject PyCPointer_Type = {
     0,                                          /* tp_free */
 };
 
-
+
 /******************************************************************/
 /*
  *  Module initialization.

Modules/_ctypes/cfield.c

@@ -334,7 +334,7 @@ PyTypeObject PyCField_Type = {
     0,                                          /* tp_free */
 };
 
-
+
 /******************************************************************/
 /*
   Accessor functions

Modules/_tkinter.c

@@ -270,7 +270,7 @@ typedef struct {
 (void *) v, Py_REFCNT(v)))
 
 
-
+
 /**** Error Handling ****/
 
 static PyObject *Tkinter_TclError;
@@ -284,7 +284,7 @@ static PyObject *trbInCmd;
 static int tk_load_failed = 0;
 #endif
 
-
+
 static PyObject *
 Tkinter_Error(PyObject *v)
 {
@@ -293,7 +293,7 @@ Tkinter_Error(PyObject *v)
 }
 
 
-
+
 /**** Utils ****/
 
 static int Tkinter_busywaitinterval = 20;
@@ -334,7 +334,7 @@ WaitForMainloop(TkappObject* self)
 }
 #endif /* WITH_THREAD */
 
-
+
 static char *
 AsString(PyObject *value, PyObject *tmp)
 {
@@ -365,7 +365,7 @@ AsString(PyObject *value, PyObject *tmp)
 }
 
 
-
+
 #define ARGSZ 64
 
 static char *
@@ -445,7 +445,7 @@ Merge(PyObject *args)
 }
 
 
-
+
 static PyObject *
 Split(char *list)
 {
@@ -549,7 +549,7 @@ SplitObj(PyObject *arg)
     return arg;
 }
 
-
+
 /**** Tkapp Object ****/
 
 #ifndef WITH_APPINIT
@@ -590,7 +590,7 @@ Tcl_AppInit(Tcl_Interp *interp)
 #endif /* !WITH_APPINIT */
 
 
-
+
 
 /* Initialize the Tk application; see the `main' function in
  * `tkMain.c'.
@@ -747,7 +747,7 @@ Tkapp_ThreadSend(TkappObject *self, Tcl_Event *ev,
 }
 #endif
 
-
+
 /** Tcl Eval **/
 
 typedef struct {
@@ -1487,7 +1487,7 @@ Tkapp_AddErrorInfo(PyObject *self, PyObject *args)
 }
 
 
-
+
 /** Tcl Variable **/
 
 typedef PyObject* (*EventFunc)(PyObject*, PyObject *args, int flags);
@@ -1665,7 +1665,7 @@ Tkapp_GlobalSetVar(PyObject *self, PyObject *args)
 }
 
 
-
+
 static PyObject *
 GetVar(PyObject *self, PyObject *args, int flags)
 {
@@ -1707,7 +1707,7 @@ Tkapp_GlobalGetVar(PyObject *self, PyObject *args)
 }
 
 
-
+
 static PyObject *
 UnsetVar(PyObject *self, PyObject *args, int flags)
 {
@@ -1744,7 +1744,7 @@ Tkapp_GlobalUnsetVar(PyObject *self, PyObject *args)
 }
 
 
-
+
 /** Tcl to Python **/
 
 static PyObject *
@@ -1901,7 +1901,7 @@ Tkapp_ExprBoolean(PyObject *self, PyObject *args)
 }
 
 
-
+
 static PyObject *
 Tkapp_SplitList(PyObject *self, PyObject *args)
 {
@@ -1980,7 +1980,7 @@ Tkapp_Merge(PyObject *self, PyObject *args)
 }
 
 
-
+
 /** Tcl Command **/
 
 /* Client data struct */
@@ -2064,7 +2064,7 @@ PythonCmdDelete(ClientData clientData)
 }
 
 
-
+
 
 #ifdef WITH_THREAD
 TCL_DECLARE_MUTEX(command_mutex)
@@ -2158,7 +2158,7 @@ Tkapp_CreateCommand(PyObject *selfptr, PyObject *args)
 }
 
 
-
+
 static PyObject *
 Tkapp_DeleteCommand(PyObject *selfptr, PyObject *args)
 {
@@ -2200,7 +2200,7 @@ Tkapp_DeleteCommand(PyObject *selfptr, PyObject *args)
 }
 
 
-
+
 #ifdef HAVE_CREATEFILEHANDLER
 /** File Handler **/
 
@@ -2330,7 +2330,7 @@ Tkapp_DeleteFileHandler(PyObject *self, PyObject *args)
 }
 #endif /* HAVE_CREATEFILEHANDLER */
 
-
+
 /**** Tktt Object (timer token) ****/
 
 static PyTypeObject Tktt_Type;
@@ -2441,7 +2441,7 @@ static PyTypeObject Tktt_Type =
 };
 
 
-
+
 /** Timer Handler **/
 
 static void
@@ -2498,7 +2498,7 @@ Tkapp_CreateTimerHandler(PyObject *self, PyObject *args)
     return (PyObject *) v;
 }
 
-
+
 /** Event Loop **/
 
 static PyObject *
@@ -2675,7 +2675,7 @@ Tkapp_WillDispatch(PyObject *self, PyObject *args)
     return Py_None;
 }
 
-
+
 /**** Tkapp Method List ****/
 
 static PyMethodDef Tkapp_methods[] =
@@ -2721,7 +2721,7 @@ static PyMethodDef Tkapp_methods[] =
 };
 
 
-
+
 /**** Tkapp Type Methods ****/
 
 static void
@@ -2768,7 +2768,7 @@ static PyTypeObject Tkapp_Type =
 };
 
 
-
+
 /**** Tkinter Module ****/
 
 typedef struct {

Python/makeopcodetargets.py

@@ -28,7 +28,7 @@ def write_contents(f):
             continue
         targets[op] = "TARGET_%s" % opname
     f.write("static void *opcode_targets[256] = {\n")
-    f.write(",\n".join(["\t&&%s" % s for s in targets]))
+    f.write(",\n".join(["    &&%s" % s for s in targets]))
     f.write("\n};\n")