mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-03 13:45:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

* various modules: #include "Python.h" and remove most remporary

Browse source 
renaming hacks
This commit is contained in:
Guido van Rossum 1994-09-14 13:32:22 +00:00
parent a96720907a
commit 602099a756
6 changed files with 19 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Modules/_cursesmodule.c
View file

@ -138,14 +138,10 @@ None notimeout(int) int=0 or int=1
/* curses module */ /* curses module */
#include "allobjects.h" #include "Python.h"
#include "fileobject.h"
#include "modsupport.h"
#include <curses.h> #include <curses.h>
#include "rename1.h"
typedef struct { typedef struct {
PyObject_HEAD PyObject_HEAD
SCREEN *scr; SCREEN *scr;

28
Modules/_tkinter.c
View file

@ -1,36 +1,10 @@
/* tkintermodule.c -- Interface to libtk.a and libtcl.a. /* tkintermodule.c -- Interface to libtk.a and libtcl.a.
Copyright (C) 1994 Steen Lumholt */ Copyright (C) 1994 Steen Lumholt */
#if 0 #include <Python.h>
#include <Py/Python.h>
#else
#include "allobjects.h"
#include "pythonrun.h"
#include "intrcheck.h"
#include "modsupport.h"
#include "sysmodule.h"
#ifndef PyObject
#define PyObject object
typedef struct methodlist PyMethodDef;
#endif
#define PyInit_tkinter inittkinter #define PyInit_tkinter inittkinter
#undef Py_True
#define Py_True ((object *) &TrueObject)
#undef True
#undef Py_False
#define Py_False ((object *) &FalseObject)
#undef False
#undef Py_None
#define Py_None (&NoObject)
#undef None
#endif /* 0 */
#include <tcl.h> #include <tcl.h>
#include <tk.h> #include <tk.h>

7
Modules/rotormodule.c
View file

@ -55,16 +55,13 @@ NOTE: you MUST use the SAME key in rotor.newrotor()
/* Rotor objects */ /* Rotor objects */
#include "allobjects.h" #include "Python.h"
#include "modsupport.h"
#include <stdio.h> #include <stdio.h>
#include <math.h> #include <math.h>
#define TRUE 1 #define TRUE 1
#define FALSE 0 #define FALSE 0
/* This is temp until the renaming effort is done with Python */
#include "rename1.h"
typedef struct { typedef struct {
PyObject_HEAD PyObject_HEAD
int seed[3]; int seed[3];

15
Modules/signalmodule.c
View file

@ -24,16 +24,12 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
/* Signal module -- many thanks to Lance Ellinghouse */ /* Signal module -- many thanks to Lance Ellinghouse */
#include "allobjects.h" #include "Python.h"
#include "modsupport.h"
#include "ceval.h"
#include "intrcheck.h" #include "intrcheck.h"
#include <signal.h> #include <signal.h>
#include <errno.h> #include <errno.h>
#include "rename1.h"
#ifndef SIG_ERR #ifndef SIG_ERR
#define SIG_ERR ((RETSIGTYPE (*)())-1) #define SIG_ERR ((RETSIGTYPE (*)())-1)
#endif #endif
@ -103,6 +99,15 @@ PySignal_Handler(sig_num)
PySignal_SignalHandlerArray[sig_num].tripped = 1; PySignal_SignalHandlerArray[sig_num].tripped = 1;
#ifdef WITH_THREAD #ifdef WITH_THREAD
} }
#endif
#ifdef SIGCHLD
if (sig_num == SIGCHLD) {
/* To avoid infinite recursion, this signal remains
reset until explicit re-instated.
Don't clear the 'func' field as it is our pointer
to the Python handler... */
return;
}
#endif #endif
(void *)signal(sig_num, &PySignal_Handler); (void *)signal(sig_num, &PySignal_Handler);
} }

12
Modules/stropmodule.c
View file

@ -206,10 +206,8 @@ strop_find(self, args)
if (getargs(args, "(s#s#i)", &s, &len, &sub, &n, &i)) { if (getargs(args, "(s#s#i)", &s, &len, &sub, &n, &i)) {
if (i < 0) if (i < 0)
i += len; i += len;
if (i < 0 || i+n > len) { if (i < 0)
err_setstr(ValueError, "start offset out of range"); i = 0;
return NULL;
}
} }
else { else {
err_clear(); err_clear();
@ -242,10 +240,8 @@ strop_rfind(self, args)
if (getargs(args, "(s#s#i)", &s, &len, &sub, &n, &i)) { if (getargs(args, "(s#s#i)", &s, &len, &sub, &n, &i)) {
if (i < 0) if (i < 0)
i += len; i += len;
if (i < 0 || i+n > len) { if (i < 0)
err_setstr(ValueError, "start offset out of range"); i = 0;
return NULL;
}
} }
else { else {
err_clear(); err_clear();

17
Modules/termios.c
View file

@ -1,24 +1,9 @@
/* termiosmodule.c -- POSIX terminal I/O module implementation. */ /* termiosmodule.c -- POSIX terminal I/O module implementation. */
#if 0 #include <Python.h>
#include <Py/Python.h>
#else
#include "allobjects.h"
#include "pythonrun.h"
#include "intrcheck.h"
#include "modsupport.h"
#include "sysmodule.h"
#ifndef PyObject
#define PyObject object
typedef struct methodlist PyMethodDef;
#endif
#define PyInit_termios inittermios #define PyInit_termios inittermios
#endif /* 0 */
#include <termios.h> #include <termios.h>
#define BAD "bad termios argument" #define BAD "bad termios argument"