__builtins__ mods (and sys_checkinterval for ceval.c)
diff --git a/Include/bltinmodule.h b/Include/bltinmodule.h
index c94cf63..2f4c120 100644
--- a/Include/bltinmodule.h
+++ b/Include/bltinmodule.h
@@ -30,9 +30,7 @@
/* Built-in module interface */
-extern object *getbuiltin PROTO((object *));
-extern object *getbuiltins PROTO((char *));
-extern int setbuiltin PROTO((char *, object *));
+extern object *getbuiltindict PROTO(());
#ifdef __cplusplus
}
diff --git a/Include/ceval.h b/Include/ceval.h
index 796b11a..d1020aa 100644
--- a/Include/ceval.h
+++ b/Include/ceval.h
@@ -32,10 +32,12 @@
object *call_object PROTO((object *, object *));
+object *getbuiltins PROTO((void));
object *getglobals PROTO((void));
object *getlocals PROTO((void));
object *getowner PROTO((void));
object *getframe PROTO((void));
+int getrestricted PROTO((void));
void flushline PROTO((void));
diff --git a/Include/frameobject.h b/Include/frameobject.h
index f8ad710..2179de8 100644
--- a/Include/frameobject.h
+++ b/Include/frameobject.h
@@ -40,6 +40,7 @@
OB_HEAD
struct _frame *f_back; /* previous frame, or NULL */
codeobject *f_code; /* code segment */
+ object *f_builtins; /* builtin symbol table (dictobject) */
object *f_globals; /* global symbol table (dictobject) */
object *f_locals; /* local symbol table (dictobject) */
object *f_owner; /* owner (e.g. class or module) or NULL */
@@ -52,6 +53,7 @@
int f_iblock; /* index in f_blockstack */
int f_lasti; /* Last instruction if called */
int f_lineno; /* Current line number */
+ int f_restricted; /* Flag set if restricted operations in this scope */
object *f_trace; /* Trace function */
} frameobject;
diff --git a/Include/rename1.h b/Include/rename1.h
index 2ae9326..90f129f 100755
--- a/Include/rename1.h
+++ b/Include/rename1.h
@@ -269,6 +269,7 @@
#define PyEval_CallObject call_object
#define PyEval_EvalCode eval_code
#define Py_FlushLine flushline
+#define PyEval_GetBuiltins getbuiltins
#define PyEval_GetGlobals getglobals
#define PyEval_GetLocals getlocals
#define PyEval_InitThreads init_save_thread
@@ -287,7 +288,7 @@
#define PyImport_Init initimport
#define PyImport_ReloadModule reload_module
#define PyNumber_Coerce coerce
-#define PyBuiltin_GetObject getbuiltin
+#define PyBuiltin_GetDict getbuiltindict
#define PyBuiltin_Init initbuiltin
#define PyMarshal_Init initmarshal
#define PyMarshal_ReadLongFromFile rd_long
@@ -317,7 +318,7 @@
#define PyRun_InteractiveLoop run_tty_loop
#define PyMember_Get getmember
#define PyMember_Set setmember
-#define Py_InitModule initmodule
+#define Py_InitModule(name, methods) initmodule(name, methods)
#define Py_BuildValue mkvalue
#define Py_VaBuildValue vmkvalue
#define PyArg_Parse getargs