mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Recorded merge of revisions 81029 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Antoine Pitrou 2010-05-09 15:15:40 +00:00
parent ba32864b2d
commit c7c96a90bc
321 changed files with 195492 additions and 195492 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Modules/_ctypes/_ctypes.c
View file

@ -103,7 +103,7 @@ bytes(cdata)
* CField_Type * CField_Type
* *
*/ */
#define PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN
#include "Python.h" #include "Python.h"
@ -140,7 +140,7 @@ static PyObject *_unpickle;
char *conversion_mode_encoding = NULL; char *conversion_mode_encoding = NULL;
char *conversion_mode_errors = NULL; char *conversion_mode_errors = NULL;
/****************************************************************/ /****************************************************************/
#if (PY_VERSION_HEX < 0x02040000) #if (PY_VERSION_HEX < 0x02040000)
@ -825,7 +825,7 @@ static PyTypeObject UnionType_Type = {
0, /* tp_free */ 0, /* tp_free */
}; };
/******************************************************************/ /******************************************************************/
/* /*
@ -1061,7 +1061,7 @@ PyTypeObject PointerType_Type = {
0, /* tp_free */ 0, /* tp_free */
}; };
/******************************************************************/ /******************************************************************/
/* /*
ArrayType_Type ArrayType_Type
@ -1455,7 +1455,7 @@ PyTypeObject ArrayType_Type = {
0, /* tp_free */ 0, /* tp_free */
}; };
/******************************************************************/ /******************************************************************/
/* /*
SimpleType_Type SimpleType_Type
@ -2359,7 +2359,7 @@ PyTypeObject CFuncPtrType_Type = {
0, /* tp_free */ 0, /* tp_free */
}; };
/***************************************************************** /*****************************************************************
* Code to keep needed objects alive * Code to keep needed objects alive
*/ */
@ -2924,7 +2924,7 @@ CData_set(PyObject *dst, PyObject *type, SETFUNC setfunc, PyObject *value,
return KeepRef(mem, index, result); return KeepRef(mem, index, result);
} }
/******************************************************************/ /******************************************************************/
static PyObject * static PyObject *
GenericCData_new(PyTypeObject *type, PyObject *args, PyObject *kwds) GenericCData_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
@ -4007,7 +4007,7 @@ PyTypeObject CFuncPtr_Type = {
CFuncPtr_new, /* tp_new */ CFuncPtr_new, /* tp_new */
0, /* tp_free */ 0, /* tp_free */
}; };
/*****************************************************************/ /*****************************************************************/
/* /*
Struct_Type Struct_Type
@ -4197,7 +4197,7 @@ static PyTypeObject Union_Type = {
0, /* tp_free */ 0, /* tp_free */
}; };
/******************************************************************/ /******************************************************************/
/* /*
Array_Type Array_Type
@ -4661,7 +4661,7 @@ CreateArrayType(PyObject *itemtype, Py_ssize_t length)
return result; return result;
} }
/******************************************************************/ /******************************************************************/
/* /*
Simple_Type Simple_Type
@ -4830,7 +4830,7 @@ static PyTypeObject Simple_Type = {
GenericCData_new, /* tp_new */ GenericCData_new, /* tp_new */
0, /* tp_free */ 0, /* tp_free */
}; };
/******************************************************************/ /******************************************************************/
/* /*
Pointer_Type Pointer_Type
@ -5251,7 +5251,7 @@ PyTypeObject Pointer_Type = {
0, /* tp_free */ 0, /* tp_free */
}; };
/******************************************************************/ /******************************************************************/
/* /*
* Module initialization. * Module initialization.

2
Modules/_ctypes/cfield.c
View file

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

48
Modules/_tkinter.c
View file

@ -270,7 +270,7 @@ typedef struct {
(void *) v, Py_REFCNT(v))) (void *) v, Py_REFCNT(v)))
/**** Error Handling ****/ /**** Error Handling ****/
static PyObject *Tkinter_TclError; static PyObject *Tkinter_TclError;
@ -281,7 +281,7 @@ static PyObject *valInCmd;
static PyObject *trbInCmd; static PyObject *trbInCmd;
static PyObject * static PyObject *
Tkinter_Error(PyObject *v) Tkinter_Error(PyObject *v)
{ {
@ -290,7 +290,7 @@ Tkinter_Error(PyObject *v)
} }
/**** Utils ****/ /**** Utils ****/
static int Tkinter_busywaitinterval = 20; static int Tkinter_busywaitinterval = 20;
@ -331,7 +331,7 @@ WaitForMainloop(TkappObject* self)
} }
#endif /* WITH_THREAD */ #endif /* WITH_THREAD */
static char * static char *
AsString(PyObject *value, PyObject *tmp) AsString(PyObject *value, PyObject *tmp)
{ {
@ -364,7 +364,7 @@ AsString(PyObject *value, PyObject *tmp)
} }
#define ARGSZ 64 #define ARGSZ 64
static char * static char *
@ -444,7 +444,7 @@ Merge(PyObject *args)
} }
static PyObject * static PyObject *
Split(char *list) Split(char *list)
{ {
@ -548,7 +548,7 @@ SplitObj(PyObject *arg)
return arg; return arg;
} }
/**** Tkapp Object ****/ /**** Tkapp Object ****/
#ifndef WITH_APPINIT #ifndef WITH_APPINIT
@ -575,7 +575,7 @@ Tcl_AppInit(Tcl_Interp *interp)
#endif /* !WITH_APPINIT */ #endif /* !WITH_APPINIT */
/* Initialize the Tk application; see the `main' function in /* Initialize the Tk application; see the `main' function in
* `tkMain.c'. * `tkMain.c'.
@ -711,7 +711,7 @@ Tkapp_ThreadSend(TkappObject *self, Tcl_Event *ev,
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
} }
/** Tcl Eval **/ /** Tcl Eval **/
typedef struct { typedef struct {
@ -1490,7 +1490,7 @@ Tkapp_AddErrorInfo(PyObject *self, PyObject *args)
} }
/** Tcl Variable **/ /** Tcl Variable **/
TCL_DECLARE_MUTEX(var_mutex) TCL_DECLARE_MUTEX(var_mutex)
@ -1655,7 +1655,7 @@ Tkapp_GlobalSetVar(PyObject *self, PyObject *args)
} }
static PyObject * static PyObject *
GetVar(PyObject *self, PyObject *args, int flags) GetVar(PyObject *self, PyObject *args, int flags)
{ {
@ -1697,7 +1697,7 @@ Tkapp_GlobalGetVar(PyObject *self, PyObject *args)
} }
static PyObject * static PyObject *
UnsetVar(PyObject *self, PyObject *args, int flags) UnsetVar(PyObject *self, PyObject *args, int flags)
{ {
@ -1734,7 +1734,7 @@ Tkapp_GlobalUnsetVar(PyObject *self, PyObject *args)
} }
/** Tcl to Python **/ /** Tcl to Python **/
static PyObject * static PyObject *
@ -1891,7 +1891,7 @@ Tkapp_ExprBoolean(PyObject *self, PyObject *args)
} }
static PyObject * static PyObject *
Tkapp_SplitList(PyObject *self, PyObject *args) Tkapp_SplitList(PyObject *self, PyObject *args)
{ {
@ -1970,7 +1970,7 @@ Tkapp_Merge(PyObject *self, PyObject *args)
} }
/** Tcl Command **/ /** Tcl Command **/
/* Client data struct */ /* Client data struct */
@ -2054,7 +2054,7 @@ PythonCmdDelete(ClientData clientData)
} }
TCL_DECLARE_MUTEX(command_mutex) TCL_DECLARE_MUTEX(command_mutex)
@ -2142,7 +2142,7 @@ Tkapp_CreateCommand(PyObject *selfptr, PyObject *args)
} }
static PyObject * static PyObject *
Tkapp_DeleteCommand(PyObject *selfptr, PyObject *args) Tkapp_DeleteCommand(PyObject *selfptr, PyObject *args)
{ {
@ -2178,7 +2178,7 @@ Tkapp_DeleteCommand(PyObject *selfptr, PyObject *args)
} }
#ifdef HAVE_CREATEFILEHANDLER #ifdef HAVE_CREATEFILEHANDLER
/** File Handler **/ /** File Handler **/
@ -2332,7 +2332,7 @@ Tkapp_DeleteFileHandler(PyObject *self, PyObject *args)
} }
#endif /* HAVE_CREATEFILEHANDLER */ #endif /* HAVE_CREATEFILEHANDLER */
/**** Tktt Object (timer token) ****/ /**** Tktt Object (timer token) ****/
static PyTypeObject Tktt_Type; static PyTypeObject Tktt_Type;
@ -2435,7 +2435,7 @@ static PyTypeObject Tktt_Type =
}; };
/** Timer Handler **/ /** Timer Handler **/
static void static void
@ -2504,7 +2504,7 @@ Tkapp_CreateTimerHandler(PyObject *self, PyObject *args)
return (PyObject *) v; return (PyObject *) v;
} }
/** Event Loop **/ /** Event Loop **/
static PyObject * static PyObject *
@ -2694,7 +2694,7 @@ Tkapp_WillDispatch(PyObject *self, PyObject *args)
return Py_None; return Py_None;
} }
/**** Tkapp Method List ****/ /**** Tkapp Method List ****/
static PyMethodDef Tkapp_methods[] = static PyMethodDef Tkapp_methods[] =
@ -2740,7 +2740,7 @@ static PyMethodDef Tkapp_methods[] =
}; };
/**** Tkapp Type Methods ****/ /**** Tkapp Type Methods ****/
static void static void
@ -2779,7 +2779,7 @@ static PyTypeObject Tkapp_Type =
}; };
/**** Tkinter Module ****/ /**** Tkinter Module ****/
typedef struct { typedef struct {

16
Modules/puremodule.c
View file

@ -58,7 +58,7 @@ typedef int (*PrintfishFunc)(const char*, ...);
typedef int (*StringIntArgFunc)(const char*, int); typedef int (*StringIntArgFunc)(const char*, int);
static PyObject* static PyObject*
call_voidarg_function(VoidArgFunc func, PyObject *self, PyObject *args) call_voidarg_function(VoidArgFunc func, PyObject *self, PyObject *args)
{ {
@ -158,7 +158,7 @@ call_stringandint_function(StringIntArgFunc func, PyObject *self,
} }
/* functions common to all products /* functions common to all products
* *
* N.B. These printf() style functions are a bit of a kludge. Since the * N.B. These printf() style functions are a bit of a kludge. Since the
@ -193,7 +193,7 @@ pure_pure_printf_with_banner(PyObject* self, PyObject* args)
#endif /* COMMON_PURE_FUNCTIONS */ #endif /* COMMON_PURE_FUNCTIONS */
/* Purify functions /* Purify functions
* *
* N.B. There are some interfaces described in the purify.h file that are * N.B. There are some interfaces described in the purify.h file that are
@ -325,7 +325,7 @@ pure_purify_get_user_data(PyObject *self, PyObject *args)
return Py_BuildValue("l", (long)data); return Py_BuildValue("l", (long)data);
} }
/* this global variable is shared by both mapping functions: /* this global variable is shared by both mapping functions:
* pure_purify_map_pool() and pure_purify_map_pool_id(). Since they cache * pure_purify_map_pool() and pure_purify_map_pool_id(). Since they cache
* this variable it should be safe in the face of recursion or cross * this variable it should be safe in the face of recursion or cross
@ -417,7 +417,7 @@ pure_purify_map_pool_id(PyObject *self, PyObject *args)
} }
static PyObject* static PyObject*
pure_purify_new_messages(PyObject *self, PyObject *args) pure_purify_new_messages(PyObject *self, PyObject *args)
{ {
@ -664,7 +664,7 @@ pure_purify_exit(PyObject *self, PyObject *args)
#endif /* PURIFY_H */ #endif /* PURIFY_H */
/* Quantify functions /* Quantify functions
* *
* N.B. Some of these functions are only described in the quantify.h file, * N.B. Some of these functions are only described in the quantify.h file,
@ -817,7 +817,7 @@ pure_quantify_add_annotation(PyObject *self, PyObject *args)
#endif /* QUANTIFY_H */ #endif /* QUANTIFY_H */
/* external interface /* external interface
*/ */
static struct PyMethodDef static struct PyMethodDef
@ -931,7 +931,7 @@ pure_methods[] = {
}; };
static void static void
ins(d, name, val) ins(d, name, val)
PyObject *d; PyObject *d;