mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Rename want_objects to wantobjects throughout, for consistency.

Browse source
This commit is contained in:
Martin v. Löwis 2002-11-26 21:39:48 +00:00
parent 94e7bb7dd6
commit 8c8aa5d666
4 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/whatsnew/whatsnew23.tex
View file

@ -1300,7 +1300,7 @@ by invoking
\begin{verbatim} \begin{verbatim}
import Tkinter import Tkinter
Tkinter.want_objects = 0 Tkinter.wantobjects = 0
\end{verbatim} \end{verbatim}
before creating the first \class{tkapp} object. before creating the first \class{tkapp} object.

4
Lib/lib-tk/Tkinter.py
View file

@ -45,7 +45,7 @@ try:
except ImportError: except ImportError:
_MacOS = None _MacOS = None
want_objects = 1 wantobjects = 1
TkVersion = float(_tkinter.TK_VERSION) TkVersion = float(_tkinter.TK_VERSION)
TclVersion = float(_tkinter.TCL_VERSION) TclVersion = float(_tkinter.TCL_VERSION)
@ -1523,7 +1523,7 @@ class Tk(Misc, Wm):
if ext not in ('.py', '.pyc', '.pyo'): if ext not in ('.py', '.pyc', '.pyo'):
baseName = baseName + ext baseName = baseName + ext
self.tk = _tkinter.create(screenName, baseName, className) self.tk = _tkinter.create(screenName, baseName, className)
self.tk.wantobjects(want_objects) self.tk.wantobjects(wantobjects)
if _MacOS and hasattr(_MacOS, 'SchedParams'): if _MacOS and hasattr(_MacOS, 'SchedParams'):
# Disable event scanning except for Command-Period # Disable event scanning except for Command-Period
_MacOS.SchedParams(1, 0) _MacOS.SchedParams(1, 0)

2
Misc/NEWS
View file

@ -317,7 +317,7 @@ Extension modules
- _tkinter now returns Tcl objects, instead of strings. Objects which - _tkinter now returns Tcl objects, instead of strings. Objects which
have Python equivalents are converted to Python objects, other objects have Python equivalents are converted to Python objects, other objects
are wrapped. This can be configured through the wantobjects method, are wrapped. This can be configured through the wantobjects method,
or Tkinter.want_objects. or Tkinter.wantobjects.
- The PyBSDDB wrapper around the Sleepycat Berkeley DB library has been - The PyBSDDB wrapper around the Sleepycat Berkeley DB library has been
added as the package bsddb. The traditional bsddb module is still added as the package bsddb. The traditional bsddb module is still

20
Modules/_tkinter.c
View file

@ -221,7 +221,7 @@ static PyTypeObject Tkapp_Type;
typedef struct { typedef struct {
PyObject_HEAD PyObject_HEAD
Tcl_Interp *interp; Tcl_Interp *interp;
int want_objects; int wantobjects;
} TkappObject; } TkappObject;
#define Tkapp_Check(v) ((v)->ob_type == &Tkapp_Type) #define Tkapp_Check(v) ((v)->ob_type == &Tkapp_Type)
@ -523,7 +523,7 @@ static void DisableEventHook(void); /* Forward */
static TkappObject * static TkappObject *
Tkapp_New(char *screenName, char *baseName, char *className, Tkapp_New(char *screenName, char *baseName, char *className,
int interactive, int want_objects) int interactive, int wantobjects)
{ {
TkappObject *v; TkappObject *v;
char *argv0; char *argv0;
@ -533,7 +533,7 @@ Tkapp_New(char *screenName, char *baseName, char *className,
return NULL; return NULL;
v->interp = Tcl_CreateInterp(); v->interp = Tcl_CreateInterp();
v->want_objects = want_objects; v->wantobjects = wantobjects;
#if defined(macintosh) #if defined(macintosh)
/* This seems to be needed */ /* This seems to be needed */
@ -901,7 +901,7 @@ Tkapp_Call(PyObject *self, PyObject *args)
ENTER_OVERLAP ENTER_OVERLAP
if (i == TCL_ERROR) if (i == TCL_ERROR)
Tkinter_Error(self); Tkinter_Error(self);
else if(((TkappObject*)self)->want_objects) { else if(((TkappObject*)self)->wantobjects) {
Tcl_Obj *value = Tcl_GetObjResult(interp); Tcl_Obj *value = Tcl_GetObjResult(interp);
/* Not sure whether the IncrRef is necessary, but something /* Not sure whether the IncrRef is necessary, but something
may overwrite the interpreter result while we are may overwrite the interpreter result while we are
@ -1967,10 +1967,10 @@ static PyObject *
Tkapp_WantObjects(PyObject *self, PyObject *args) Tkapp_WantObjects(PyObject *self, PyObject *args)
{ {
int want_objects; int wantobjects;
if (!PyArg_ParseTuple(args, "i:wantobjects", &want_objects)) if (!PyArg_ParseTuple(args, "i:wantobjects", &wantobjects))
return NULL; return NULL;
((TkappObject*)self)->want_objects = want_objects; ((TkappObject*)self)->wantobjects = wantobjects;
Py_INCREF(Py_None); Py_INCREF(Py_None);
return Py_None; return Py_None;
@ -2179,7 +2179,7 @@ Tkinter_Create(PyObject *self, PyObject *args)
char *baseName = NULL; char *baseName = NULL;
char *className = NULL; char *className = NULL;
int interactive = 0; int interactive = 0;
int want_objects = 0; int wantobjects = 0;
baseName = strrchr(Py_GetProgramName(), '/'); baseName = strrchr(Py_GetProgramName(), '/');
if (baseName != NULL) if (baseName != NULL)
@ -2190,11 +2190,11 @@ Tkinter_Create(PyObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "|zssi:create", if (!PyArg_ParseTuple(args, "|zssi:create",
&screenName, &baseName, &className, &screenName, &baseName, &className,
&interactive, &want_objects)) &interactive, &wantobjects))
return NULL; return NULL;
return (PyObject *) Tkapp_New(screenName, baseName, className, return (PyObject *) Tkapp_New(screenName, baseName, className,
interactive, want_objects); interactive, wantobjects);
} }
static PyMethodDef moduleMethods[] = static PyMethodDef moduleMethods[] =