Mailman 3 February 2004 - Python-checkins

python/nondist/sandbox/pep262 TODO,NONE,1.1
by akuchling＠users.sourceforge.net Feb. 18, 2004

Feb. 18, 2004

Update of /cvsroot/python/python/nondist/sandbox/pep262 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14753 Added Files: TODO Log Message: Check in TODO list after rescuing it from my laptop --- NEW FILE: TODO --- * Should the package database store the Conflicts and Obsoletes information? * Write version requirement parser & evaluator * sdist: Write Requires / Provides lines into PKG-INFO * install_*: Update package database on installation

1 0

python/dist/src/Lib/lib-tk Tkinter.py, 1.178, 1.179
by david_ascher＠users.sourceforge.net Feb. 18, 2004

Feb. 18, 2004

Update of /cvsroot/python/python/dist/src/Lib/lib-tk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24617/dist/src/Lib/lib-tk Modified Files: Tkinter.py Log Message: Implementation of patch 869468 Allow the user to create Tkinter.Tcl objects which are just like Tkinter.Tk objects except that they do not initialize Tk. This is useful in circumstances where the script is being run on machines that do not have an X server running -- in those cases, Tk initialization fails, even if no window is ever created. Includes documentation change and tests. Tested on Linux, Solaris and Windows. Reviewed by Martin von Loewis. Index: Tkinter.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/lib-tk/Tkinter.py,v retrieving revision 1.178 retrieving revision 1.179 diff -C2 -d -r1.178 -r1.179 *** Tkinter.py 12 Feb 2004 17:35:09 -0000 1.178 --- Tkinter.py 18 Feb 2004 05:59:53 -0000 1.179 *************** *** 1547,1551 **** of an appliation. It has an associated Tcl interpreter.""" _w = '.' ! def __init__(self, screenName=None, baseName=None, className='Tk'): """Return a new Toplevel widget on screen SCREENNAME. A new Tcl interpreter will be created. BASENAME will be used for the identification of the profile file (see --- 1547,1551 ---- of an appliation. It has an associated Tcl interpreter.""" _w = '.' ! def __init__(self, screenName=None, baseName=None, className='Tk', useTk=1): """Return a new Toplevel widget on screen SCREENNAME. A new Tcl interpreter will be created. BASENAME will be used for the identification of the profile file (see *************** *** 1553,1559 **** It is constructed from sys.argv[0] without extensions if None is given. CLASSNAME is the name of the widget class.""" - global _default_root self.master = None self.children = {} if baseName is None: import sys, os --- 1553,1562 ---- It is constructed from sys.argv[0] without extensions if None is given. CLASSNAME is the name of the widget class.""" self.master = None self.children = {} + self._tkloaded = 0 + # to avoid recursions in the getattr code in case of failure, we + # ensure that self.tk is always _something_. + self.tk = None if baseName is None: import sys, os *************** *** 1562,1567 **** if ext not in ('.py', '.pyc', '.pyo'): baseName = baseName + ext ! self.tk = _tkinter.create(screenName, baseName, className) ! self.tk.wantobjects(wantobjects) if _MacOS and hasattr(_MacOS, 'SchedParams'): # Disable event scanning except for Command-Period --- 1565,1580 ---- if ext not in ('.py', '.pyc', '.pyo'): baseName = baseName + ext ! interactive = 0 ! self.tk = _tkinter.create(screenName, baseName, className, interactive, wantobjects, useTk) ! if useTk: ! self._loadtk() ! self.readprofile(baseName, className) ! def loadtk(self): ! if not self._tkloaded: ! self.tk.loadtk() ! self._loadtk() ! def _loadtk(self): ! self._tkloaded = 1 ! global _default_root if _MacOS and hasattr(_MacOS, 'SchedParams'): # Disable event scanning except for Command-Period *************** *** 1588,1592 **** self.tk.createcommand('tkerror', _tkerror) self.tk.createcommand('exit', _exit) - self.readprofile(baseName, className) if _support_default_root and not _default_root: _default_root = self --- 1601,1604 ---- *************** *** 1630,1633 **** --- 1642,1654 ---- sys.last_traceback = tb traceback.print_exception(exc, val, tb) + def __getattr__(self, attr): + "Delegate attribute access to the interpreter object" + return getattr(self.tk, attr) + def __hasattr__(self, attr): + "Delegate attribute access to the interpreter object" + return hasattr(self.tk, attr) + def __delattr__(self, attr): + "Delegate attribute access to the interpreter object" + return delattr(self.tk, attr) # Ideally, the classes Pack, Place and Grid disappear, the *************** *** 1645,1648 **** --- 1666,1673 ---- # copied into the Pack, Place or Grid class. + + def Tcl(screenName=None, baseName=None, className='Tk', useTk=0): + return Tk(screenName, baseName, className, useTk) + class Pack: """Geometry manager Pack.

2 1

python/dist/src/Modules _tkinter.c,1.164,1.165
by nnorwitz＠users.sourceforge.net Feb. 18, 2004

Feb. 18, 2004

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12035/Modules Modified Files: _tkinter.c Log Message: Remove gcc warning from using "main". Use METH_NOARGS instead of METH_VARARGS Index: _tkinter.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/_tkinter.c,v retrieving revision 1.164 retrieving revision 1.165 diff -C2 -d -r1.164 -r1.165 *** _tkinter.c 18 Feb 2004 05:59:53 -0000 1.164 --- _tkinter.c 19 Feb 2004 02:44:22 -0000 1.165 *************** *** 2574,2584 **** { Tcl_Interp *interp = Tkapp_Interp(self); ! Tk_Window main; const char * _tk_exists = NULL; PyObject *res = NULL; int err; ! main = Tk_MainWindow(interp); ! if (!PyArg_ParseTuple(args, ":loadtk")) ! return NULL; /* We want to guard against calling Tk_Init() multiple times */ --- 2574,2582 ---- { Tcl_Interp *interp = Tkapp_Interp(self); ! Tk_Window main_window; const char * _tk_exists = NULL; PyObject *res = NULL; int err; ! main_window = Tk_MainWindow(interp); /* We want to guard against calling Tk_Init() multiple times */ *************** *** 2672,2676 **** {"quit", Tkapp_Quit, METH_VARARGS}, {"interpaddr", Tkapp_InterpAddr, METH_VARARGS}, ! {"loadtk", Tkapp_TkInit, METH_VARARGS}, {NULL, NULL} }; --- 2670,2674 ---- {"quit", Tkapp_Quit, METH_VARARGS}, {"interpaddr", Tkapp_InterpAddr, METH_VARARGS}, ! {"loadtk", Tkapp_TkInit, METH_NOARGS}, {NULL, NULL} };

1 0

python/dist/src/Lib/test test_tcl.py,1.1,1.2
by nnorwitz＠users.sourceforge.net Feb. 18, 2004

Feb. 18, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10755/Lib/test Modified Files: test_tcl.py Log Message: Get test to work when run from regrtest (add test_main), remove all CRs (^M)s Index: test_tcl.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_tcl.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** test_tcl.py 18 Feb 2004 05:59:53 -0000 1.1 --- test_tcl.py 19 Feb 2004 02:37:29 -0000 1.2 *************** *** 1,159 **** ! #!/usr/bin/env python ! ! import unittest ! import os ! from Tkinter import Tcl ! from _tkinter import TclError ! ! class TclTest(unittest.TestCase): ! ! def setUp(self): ! self.interp = Tcl() ! ! def testEval(self): ! tcl = self.interp ! tcl.eval('set a 1') ! self.assertEqual(tcl.eval('set a'),'1') ! ! def testEvalException(self): ! tcl = self.interp ! self.assertRaises(TclError,tcl.eval,'set a') ! ! def testEvalException2(self): ! tcl = self.interp ! self.assertRaises(TclError,tcl.eval,'this is wrong') ! ! def testCall(self): ! tcl = self.interp ! tcl.call('set','a','1') ! self.assertEqual(tcl.call('set','a'),'1') ! ! def testCallException(self): ! tcl = self.interp ! self.assertRaises(TclError,tcl.call,'set','a') ! ! def testCallException2(self): ! tcl = self.interp ! self.assertRaises(TclError,tcl.call,'this','is','wrong') ! ! def testSetVar(self): ! tcl = self.interp ! tcl.setvar('a','1') ! self.assertEqual(tcl.eval('set a'),'1') ! ! def testSetVarArray(self): ! tcl = self.interp ! tcl.setvar('a(1)','1') ! self.assertEqual(tcl.eval('set a(1)'),'1') ! ! def testGetVar(self): ! tcl = self.interp ! tcl.eval('set a 1') ! self.assertEqual(tcl.getvar('a'),'1') ! ! def testGetVarArray(self): ! tcl = self.interp ! tcl.eval('set a(1) 1') ! self.assertEqual(tcl.getvar('a(1)'),'1') ! ! def testGetVarException(self): ! tcl = self.interp ! self.assertRaises(TclError,tcl.getvar,'a') ! ! def testGetVarArrayException(self): ! tcl = self.interp ! self.assertRaises(TclError,tcl.getvar,'a(1)') ! ! def testUnsetVar(self): ! tcl = self.interp ! tcl.setvar('a',1) ! self.assertEqual(tcl.eval('info exists a'),'1') ! tcl.unsetvar('a') ! self.assertEqual(tcl.eval('info exists a'),'0') ! ! def testUnsetVarArray(self): ! tcl = self.interp ! tcl.setvar('a(1)',1) ! tcl.setvar('a(2)',2) ! self.assertEqual(tcl.eval('info exists a(1)'),'1') ! self.assertEqual(tcl.eval('info exists a(2)'),'1') ! tcl.unsetvar('a(1)') ! self.assertEqual(tcl.eval('info exists a(1)'),'0') ! self.assertEqual(tcl.eval('info exists a(2)'),'1') ! ! def testUnsetVarException(self): ! tcl = self.interp ! self.assertRaises(TclError,tcl.unsetvar,'a') ! ! def testEvalFile(self): ! tcl = self.interp ! filename = "testEvalFile.tcl" ! fd = open(filename,'w') ! script = """set a 1 ! set b 2 ! set c [ expr $a + $b ] ! """ ! fd.write(script) ! fd.close() ! tcl.evalfile(filename) ! self.assertEqual(tcl.eval('set a'),'1') ! self.assertEqual(tcl.eval('set b'),'2') ! self.assertEqual(tcl.eval('set c'),'3') ! ! def testEvalFileException(self): ! tcl = self.interp ! filename = "doesnotexists" ! try: ! os.remove(filename) ! except Exception,e: ! pass ! self.assertRaises(TclError,tcl.evalfile,filename) ! ! def testPackageRequire(self): ! tcl = self.interp ! tcl.eval('package require Tclx') ! tcl.eval('keylset a b.c 1') ! self.assertEqual(tcl.eval('keylget a b.c'),'1') ! ! def testPackageRequireException(self): ! tcl = self.interp ! self.assertRaises(TclError,tcl.eval,'package require DNE') ! ! def testLoadTk(self): ! import os ! if 'DISPLAY' not in os.environ: ! # skipping test of clean upgradeability ! return ! tcl = Tcl() ! self.assertRaises(TclError,tcl.winfo_geometry) ! tcl.loadtk() ! self.assertEqual('1x1+0+0', tcl.winfo_geometry()) ! ! def testLoadTkFailure(self): ! import os ! old_display = None ! import sys ! if sys.platform.startswith('win'): ! return # no failure possible on windows? ! if 'DISPLAY' in os.environ: ! old_display = os.environ['DISPLAY'] ! del os.environ['DISPLAY'] ! # on some platforms, deleting environment variables ! # doesn't actually carry through to the process level ! # because they don't support unsetenv ! # If that's the case, abort. ! display = os.popen('echo $DISPLAY').read().strip() ! if display: ! return ! try: ! tcl = Tcl() ! self.assertRaises(TclError, tcl.winfo_geometry) ! self.assertRaises(TclError, tcl.loadtk) ! finally: ! if old_display is not None: ! os.environ['DISPLAY'] = old_display ! ! if __name__ == "__main__": ! unittest.main() ! ! --- 1,161 ---- ! #!/usr/bin/env python ! ! import unittest ! import os ! from test import test_support ! from Tkinter import Tcl ! from _tkinter import TclError ! ! class TclTest(unittest.TestCase): ! ! def setUp(self): ! self.interp = Tcl() ! ! def testEval(self): ! tcl = self.interp ! tcl.eval('set a 1') ! self.assertEqual(tcl.eval('set a'),'1') ! ! def testEvalException(self): ! tcl = self.interp ! self.assertRaises(TclError,tcl.eval,'set a') ! ! def testEvalException2(self): ! tcl = self.interp ! self.assertRaises(TclError,tcl.eval,'this is wrong') ! ! def testCall(self): ! tcl = self.interp ! tcl.call('set','a','1') ! self.assertEqual(tcl.call('set','a'),'1') ! ! def testCallException(self): ! tcl = self.interp ! self.assertRaises(TclError,tcl.call,'set','a') ! ! def testCallException2(self): ! tcl = self.interp ! self.assertRaises(TclError,tcl.call,'this','is','wrong') ! ! def testSetVar(self): ! tcl = self.interp ! tcl.setvar('a','1') ! self.assertEqual(tcl.eval('set a'),'1') ! ! def testSetVarArray(self): ! tcl = self.interp ! tcl.setvar('a(1)','1') ! self.assertEqual(tcl.eval('set a(1)'),'1') ! ! def testGetVar(self): ! tcl = self.interp ! tcl.eval('set a 1') ! self.assertEqual(tcl.getvar('a'),'1') ! ! def testGetVarArray(self): ! tcl = self.interp ! tcl.eval('set a(1) 1') ! self.assertEqual(tcl.getvar('a(1)'),'1') ! ! def testGetVarException(self): ! tcl = self.interp ! self.assertRaises(TclError,tcl.getvar,'a') ! ! def testGetVarArrayException(self): ! tcl = self.interp ! self.assertRaises(TclError,tcl.getvar,'a(1)') ! ! def testUnsetVar(self): ! tcl = self.interp ! tcl.setvar('a',1) ! self.assertEqual(tcl.eval('info exists a'),'1') ! tcl.unsetvar('a') ! self.assertEqual(tcl.eval('info exists a'),'0') ! ! def testUnsetVarArray(self): ! tcl = self.interp ! tcl.setvar('a(1)',1) ! tcl.setvar('a(2)',2) ! self.assertEqual(tcl.eval('info exists a(1)'),'1') ! self.assertEqual(tcl.eval('info exists a(2)'),'1') ! tcl.unsetvar('a(1)') ! self.assertEqual(tcl.eval('info exists a(1)'),'0') ! self.assertEqual(tcl.eval('info exists a(2)'),'1') ! ! def testUnsetVarException(self): ! tcl = self.interp ! self.assertRaises(TclError,tcl.unsetvar,'a') ! ! def testEvalFile(self): ! tcl = self.interp ! filename = "testEvalFile.tcl" ! fd = open(filename,'w') ! script = """set a 1 ! set b 2 ! set c [ expr $a + $b ] ! """ ! fd.write(script) ! fd.close() ! tcl.evalfile(filename) ! self.assertEqual(tcl.eval('set a'),'1') ! self.assertEqual(tcl.eval('set b'),'2') ! self.assertEqual(tcl.eval('set c'),'3') ! ! def testEvalFileException(self): ! tcl = self.interp ! filename = "doesnotexists" ! try: ! os.remove(filename) ! except Exception,e: ! pass ! self.assertRaises(TclError,tcl.evalfile,filename) ! ! def testPackageRequire(self): ! tcl = self.interp ! tcl.eval('package require Tclx') ! tcl.eval('keylset a b.c 1') ! self.assertEqual(tcl.eval('keylget a b.c'),'1') ! ! def testPackageRequireException(self): ! tcl = self.interp ! self.assertRaises(TclError,tcl.eval,'package require DNE') ! ! def testLoadTk(self): ! import os ! if 'DISPLAY' not in os.environ: ! # skipping test of clean upgradeability ! return ! tcl = Tcl() ! self.assertRaises(TclError,tcl.winfo_geometry) ! tcl.loadtk() ! self.assertEqual('1x1+0+0', tcl.winfo_geometry()) ! ! def testLoadTkFailure(self): ! import os ! old_display = None ! import sys ! if sys.platform.startswith('win'): ! return # no failure possible on windows? ! if 'DISPLAY' in os.environ: ! old_display = os.environ['DISPLAY'] ! del os.environ['DISPLAY'] ! # on some platforms, deleting environment variables ! # doesn't actually carry through to the process level ! # because they don't support unsetenv ! # If that's the case, abort. ! display = os.popen('echo $DISPLAY').read().strip() ! if display: ! return ! try: ! tcl = Tcl() ! self.assertRaises(TclError, tcl.winfo_geometry) ! self.assertRaises(TclError, tcl.loadtk) ! finally: ! if old_display is not None: ! os.environ['DISPLAY'] = old_display ! ! def test_main(): ! test_support.run_unittest(TclTest) ! ! if __name__ == "__main__": ! test_main()

1 0

python/dist/src/Objects listobject.c,2.182,2.183
by rhettinger＠users.sourceforge.net Feb. 18, 2004

Feb. 18, 2004

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29979 Modified Files: listobject.c Log Message: Double the speed of list.pop() which was spending most of its time parsing arguments. Index: listobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/listobject.c,v retrieving revision 2.182 retrieving revision 2.183 diff -C2 -d -r2.182 -r2.183 *** listobject.c 15 Feb 2004 03:57:00 -0000 2.182 --- listobject.c 17 Feb 2004 11:36:16 -0000 2.183 *************** *** 773,779 **** { int i = -1; ! PyObject *v; ! if (!PyArg_ParseTuple(args, "|i:pop", &i)) return NULL; if (self->ob_size == 0) { /* Special-case most common failure cause */ --- 773,788 ---- { int i = -1; ! PyObject *v, *arg = NULL; ! ! if (!PyArg_UnpackTuple(args, "pop", 0, 1, &arg)) return NULL; + if (arg != NULL) { + if (PyInt_Check(arg)) + i = (int)(PyInt_AS_LONG((PyIntObject*) arg)); + else { + PyErr_SetString(PyExc_TypeError, "an integer is required"); + return NULL; + } + } if (self->ob_size == 0) { /* Special-case most common failure cause */

2 1

python/dist/src/Modules _tkinter.c, 1.163, 1.164 tkappinit.c, 1.10, 1.11
by david_ascher＠users.sourceforge.net Feb. 17, 2004

Feb. 17, 2004

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24617/dist/src/Modules Modified Files: _tkinter.c tkappinit.c Log Message: Implementation of patch 869468 Allow the user to create Tkinter.Tcl objects which are just like Tkinter.Tk objects except that they do not initialize Tk. This is useful in circumstances where the script is being run on machines that do not have an X server running -- in those cases, Tk initialization fails, even if no window is ever created. Includes documentation change and tests. Tested on Linux, Solaris and Windows. Reviewed by Martin von Loewis. Index: _tkinter.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/_tkinter.c,v retrieving revision 1.163 retrieving revision 1.164 diff -C2 -d -r1.163 -r1.164 *** _tkinter.c 20 Nov 2003 01:44:58 -0000 1.163 --- _tkinter.c 18 Feb 2004 05:59:53 -0000 1.164 *************** *** 547,559 **** { Tk_Window main; - main = Tk_MainWindow(interp); if (Tcl_Init(interp) == TCL_ERROR) { PySys_WriteStderr("Tcl_Init error: %s\n", Tcl_GetStringResult(interp)); return TCL_ERROR; } ! if (Tk_Init(interp) == TCL_ERROR) { ! PySys_WriteStderr("Tk_Init error: %s\n", Tcl_GetStringResult(interp)); ! return TCL_ERROR; } return TCL_OK; --- 547,563 ---- { Tk_Window main; + const char * _tkinter_skip_tk_init; if (Tcl_Init(interp) == TCL_ERROR) { PySys_WriteStderr("Tcl_Init error: %s\n", Tcl_GetStringResult(interp)); return TCL_ERROR; } ! _tkinter_skip_tk_init = Tcl_GetVar(interp, "_tkinter_skip_tk_init", TCL_GLOBAL_ONLY); ! if (_tkinter_skip_tk_init == NULL || strcmp(_tkinter_skip_tk_init, "1") != 0) { ! main = Tk_MainWindow(interp); ! if (Tk_Init(interp) == TCL_ERROR) { ! PySys_WriteStderr("Tk_Init error: %s\n", Tcl_GetStringResult(interp)); ! return TCL_ERROR; ! } } return TCL_OK; *************** *** 573,581 **** static TkappObject * Tkapp_New(char *screenName, char *baseName, char *className, ! int interactive, int wantobjects) { TkappObject *v; char *argv0; - v = PyObject_New(TkappObject, &Tkapp_Type); if (v == NULL) --- 577,584 ---- static TkappObject * Tkapp_New(char *screenName, char *baseName, char *className, ! int interactive, int wantobjects, int wantTk) { TkappObject *v; char *argv0; v = PyObject_New(TkappObject, &Tkapp_Type); if (v == NULL) *************** *** 638,641 **** --- 641,648 ---- ckfree(argv0); + if (! wantTk) { + Tcl_SetVar(v->interp, "_tkinter_skip_tk_init", "1", TCL_GLOBAL_ONLY); + } + if (Tcl_AppInit(v->interp) != TCL_OK) return (TkappObject *)Tkinter_Error((PyObject *)v); *************** *** 2563,2566 **** --- 2570,2608 ---- } + static PyObject * + Tkapp_TkInit(PyObject *self, PyObject *args) + { + Tcl_Interp *interp = Tkapp_Interp(self); + Tk_Window main; + const char * _tk_exists = NULL; + PyObject *res = NULL; + int err; + main = Tk_MainWindow(interp); + if (!PyArg_ParseTuple(args, ":loadtk")) + return NULL; + + /* We want to guard against calling Tk_Init() multiple times */ + CHECK_TCL_APPARTMENT; + ENTER_TCL + err = Tcl_Eval(Tkapp_Interp(self), "info exists tk_version"); + ENTER_OVERLAP + if (err == TCL_ERROR) { + res = Tkinter_Error(self); + } else { + _tk_exists = Tkapp_Result(self); + } + LEAVE_OVERLAP_TCL + if (err == TCL_ERROR) { + return NULL; + } + if (_tk_exists == NULL || strcmp(_tk_exists, "1") != 0) { + if (Tk_Init(interp) == TCL_ERROR) { + PyErr_SetString(Tkinter_TclError, Tcl_GetStringResult(Tkapp_Interp(self))); + return NULL; + } + } + Py_INCREF(Py_None); + return Py_None; + } static PyObject * *************** *** 2630,2633 **** --- 2672,2676 ---- {"quit", Tkapp_Quit, METH_VARARGS}, {"interpaddr", Tkapp_InterpAddr, METH_VARARGS}, + {"loadtk", Tkapp_TkInit, METH_VARARGS}, {NULL, NULL} }; *************** *** 2794,2797 **** --- 2837,2841 ---- int interactive = 0; int wantobjects = 0; + int wantTk = 1; /* If false, then Tk_Init() doesn't get called */ baseName = strrchr(Py_GetProgramName(), '/'); *************** *** 2802,2812 **** className = "Tk"; ! if (!PyArg_ParseTuple(args, "|zssii:create", &screenName, &baseName, &className, ! &interactive, &wantobjects)) return NULL; return (PyObject *) Tkapp_New(screenName, baseName, className, ! interactive, wantobjects); } --- 2846,2856 ---- className = "Tk"; ! if (!PyArg_ParseTuple(args, "|zssiii:create", &screenName, &baseName, &className, ! &interactive, &wantobjects, &wantTk)) return NULL; return (PyObject *) Tkapp_New(screenName, baseName, className, ! interactive, wantobjects, wantTk); } Index: tkappinit.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/tkappinit.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** tkappinit.c 9 Dec 2001 23:15:56 -0000 1.10 --- tkappinit.c 18 Feb 2004 05:59:53 -0000 1.11 *************** *** 20,23 **** --- 20,24 ---- { Tk_Window main_window; + const char * _tkinter_skip_tk_init; #ifdef TK_AQUA *************** *** 69,73 **** #endif ! if (Tk_Init (interp) == TCL_ERROR) return TCL_ERROR; --- 70,82 ---- #endif ! #ifdef WITH_XXX ! // Initialize modules that don't require Tk ! #endif ! ! _tkinter_skip_tk_init = Tcl_GetVar(interp, "_tkinter_skip_tk_init", TCL_GLOBAL_ONLY); ! if (_tkinter_skip_tk_init != NULL && strcmp(_tkinter_skip_tk_init, "1") == 0) { ! return TCL_OK; ! } ! if (Tk_Init(interp) == TCL_ERROR) return TCL_ERROR;

1 0

python/dist/src/Lib/test test_tcl.py,NONE,1.1
by david_ascher＠users.sourceforge.net Feb. 17, 2004

Feb. 17, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24617/dist/src/Lib/test Added Files: test_tcl.py Log Message: Implementation of patch 869468 Allow the user to create Tkinter.Tcl objects which are just like Tkinter.Tk objects except that they do not initialize Tk. This is useful in circumstances where the script is being run on machines that do not have an X server running -- in those cases, Tk initialization fails, even if no window is ever created. Includes documentation change and tests. Tested on Linux, Solaris and Windows. Reviewed by Martin von Loewis. --- NEW FILE: test_tcl.py --- #!/usr/bin/env python import unittest import os from Tkinter import Tcl from _tkinter import TclError class TclTest(unittest.TestCase): def setUp(self): self.interp = Tcl() def testEval(self): tcl = self.interp tcl.eval('set a 1') self.assertEqual(tcl.eval('set a'),'1') def testEvalException(self): tcl = self.interp self.assertRaises(TclError,tcl.eval,'set a') def testEvalException2(self): tcl = self.interp self.assertRaises(TclError,tcl.eval,'this is wrong') def testCall(self): tcl = self.interp tcl.call('set','a','1') self.assertEqual(tcl.call('set','a'),'1') def testCallException(self): tcl = self.interp self.assertRaises(TclError,tcl.call,'set','a') def testCallException2(self): tcl = self.interp self.assertRaises(TclError,tcl.call,'this','is','wrong') def testSetVar(self): tcl = self.interp tcl.setvar('a','1') self.assertEqual(tcl.eval('set a'),'1') def testSetVarArray(self): tcl = self.interp tcl.setvar('a(1)','1') self.assertEqual(tcl.eval('set a(1)'),'1') def testGetVar(self): tcl = self.interp tcl.eval('set a 1') self.assertEqual(tcl.getvar('a'),'1') def testGetVarArray(self): tcl = self.interp tcl.eval('set a(1) 1') self.assertEqual(tcl.getvar('a(1)'),'1') def testGetVarException(self): tcl = self.interp self.assertRaises(TclError,tcl.getvar,'a') def testGetVarArrayException(self): tcl = self.interp self.assertRaises(TclError,tcl.getvar,'a(1)') def testUnsetVar(self): tcl = self.interp tcl.setvar('a',1) self.assertEqual(tcl.eval('info exists a'),'1') tcl.unsetvar('a') self.assertEqual(tcl.eval('info exists a'),'0') def testUnsetVarArray(self): tcl = self.interp tcl.setvar('a(1)',1) tcl.setvar('a(2)',2) self.assertEqual(tcl.eval('info exists a(1)'),'1') self.assertEqual(tcl.eval('info exists a(2)'),'1') tcl.unsetvar('a(1)') self.assertEqual(tcl.eval('info exists a(1)'),'0') self.assertEqual(tcl.eval('info exists a(2)'),'1') def testUnsetVarException(self): tcl = self.interp self.assertRaises(TclError,tcl.unsetvar,'a') def testEvalFile(self): tcl = self.interp filename = "testEvalFile.tcl" fd = open(filename,'w') script = """set a 1 set b 2 set c [ expr $a + $b ] """ fd.write(script) fd.close() tcl.evalfile(filename) self.assertEqual(tcl.eval('set a'),'1') self.assertEqual(tcl.eval('set b'),'2') self.assertEqual(tcl.eval('set c'),'3') def testEvalFileException(self): tcl = self.interp filename = "doesnotexists" try: os.remove(filename) except Exception,e: pass self.assertRaises(TclError,tcl.evalfile,filename) def testPackageRequire(self): tcl = self.interp tcl.eval('package require Tclx') tcl.eval('keylset a b.c 1') self.assertEqual(tcl.eval('keylget a b.c'),'1') def testPackageRequireException(self): tcl = self.interp self.assertRaises(TclError,tcl.eval,'package require DNE') def testLoadTk(self): import os if 'DISPLAY' not in os.environ: # skipping test of clean upgradeability return tcl = Tcl() self.assertRaises(TclError,tcl.winfo_geometry) tcl.loadtk() self.assertEqual('1x1+0+0', tcl.winfo_geometry()) def testLoadTkFailure(self): import os old_display = None import sys if sys.platform.startswith('win'): return # no failure possible on windows? if 'DISPLAY' in os.environ: old_display = os.environ['DISPLAY'] del os.environ['DISPLAY'] # on some platforms, deleting environment variables # doesn't actually carry through to the process level # because they don't support unsetenv # If that's the case, abort. display = os.popen('echo $DISPLAY').read().strip() if display: return try: tcl = Tcl() self.assertRaises(TclError, tcl.winfo_geometry) self.assertRaises(TclError, tcl.loadtk) finally: if old_display is not None: os.environ['DISPLAY'] = old_display if __name__ == "__main__": unittest.main()

1 0

python/dist/src/Doc/lib tkinter.tex,1.22,1.23
by david_ascher＠users.sourceforge.net Feb. 17, 2004

Feb. 17, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24617/dist/src/Doc/lib Modified Files: tkinter.tex Log Message: Implementation of patch 869468 Allow the user to create Tkinter.Tcl objects which are just like Tkinter.Tk objects except that they do not initialize Tk. This is useful in circumstances where the script is being run on machines that do not have an X server running -- in those cases, Tk initialization fails, even if no window is ever created. Includes documentation change and tests. Tested on Linux, Solaris and Windows. Reviewed by Martin von Loewis. Index: tkinter.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/tkinter.tex,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** tkinter.tex 28 Jul 2003 14:39:13 -0000 1.22 --- tkinter.tex 18 Feb 2004 05:59:52 -0000 1.23 *************** *** 95,99 **** \end{verbatim} ! \begin{classdesc}{Tk}{screenName=None, baseName=None, className='Tk'} The \class{Tk} class is instantiated without arguments. This creates a toplevel widget of Tk which usually is the main window --- 95,99 ---- \end{verbatim} ! \begin{classdesc}{Tk}{screenName=None, baseName=None, className='Tk', useTk=1} The \class{Tk} class is instantiated without arguments. This creates a toplevel widget of Tk which usually is the main window *************** *** 102,105 **** --- 102,116 ---- \end{classdesc} + \begin{funcdesc}{Tcl}{screenName=None, baseName=None, className='Tk', useTk=0} + The \function{Tcl} function is a factory function which creates an object + much like that created by the \class{Tk} class, except that it does not + initialize the Tk subsystem. This is most often useful when driving the Tcl + interpreter in an environment where one doesn't want to create extraneous + toplevel windows, or where one cannot (i.e. Unix/Linux systems without an X + server). An object created by the \function{Tcl} object can have a Toplevel + window created (and the Tk subsystem initialized) by calling its + \method{loadtk} method. + \end{funcdesc} + Other modules that provide Tk support include:

1 0

python/dist/src/Lib/distutils dist.py,1.64,1.65
by fdrake＠users.sourceforge.net Feb. 17, 2004

Feb. 17, 2004

Update of /cvsroot/python/python/dist/src/Lib/distutils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7434 Modified Files: dist.py Log Message: commentary about how bad ConfigParser is doesn't help here, and the suggested approach to dealing with it isn't a good one; we need a better general purpose config reader, not a distutils-specific reader Index: dist.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/distutils/dist.py,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** dist.py 12 Feb 2004 17:35:08 -0000 1.64 --- dist.py 17 Feb 2004 22:35:19 -0000 1.65 *************** *** 347,353 **** # Make the ConfigParser forget everything (so we retain ! # the original filenames that options come from) -- gag, ! # retch, puke -- another good reason for a distutils- ! # specific config parser (sigh...) parser.__init__() --- 347,351 ---- # Make the ConfigParser forget everything (so we retain ! # the original filenames that options come from) parser.__init__()

1 0

python/dist/src/Objects dictobject.c,2.150,2.151
by jhylton＠users.sourceforge.net Feb. 17, 2004

Feb. 17, 2004

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7265 Modified Files: dictobject.c Log Message: Oops. Return -1 to distinguish error from empty dict. This change probably isn't work a bug fix. It's unlikely that anyone was calling this method without passing it a real dict. Index: dictobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/dictobject.c,v retrieving revision 2.150 retrieving revision 2.151 diff -C2 -d -r2.150 -r2.151 *** dictobject.c 13 Dec 2003 13:31:55 -0000 2.150 --- dictobject.c 17 Feb 2004 20:10:11 -0000 2.151 *************** *** 1257,1261 **** if (mp == NULL || !PyDict_Check(mp)) { PyErr_BadInternalCall(); ! return 0; } return ((dictobject *)mp)->ma_used; --- 1257,1261 ---- if (mp == NULL || !PyDict_Check(mp)) { PyErr_BadInternalCall(); ! return -1; } return ((dictobject *)mp)->ma_used;

1 0