Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 13:41:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add initial values to variables to avoid crash in __del__

Browse source
This commit is contained in:
Guido van Rossum 1996-09-05 16:45:49 +00:00
parent 932c06e4ff
commit e1a7a3b3b3
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -76,6 +76,7 @@ def _exit(code='0'):
_varnum = 0 _varnum = 0
class Variable: class Variable:
_default = ""
def __init__(self, master=None): def __init__(self, master=None):
global _default_root global _default_root
global _varnum global _varnum
@ -85,6 +86,7 @@ def __init__(self, master=None):
self._tk = _default_root.tk self._tk = _default_root.tk
self._name = 'PY_VAR' + `_varnum` self._name = 'PY_VAR' + `_varnum`
_varnum = _varnum + 1 _varnum = _varnum + 1
self.set(self._default)
def __del__(self): def __del__(self):
self._tk.globalunsetvar(self._name) self._tk.globalunsetvar(self._name)
def __str__(self): def __str__(self):
@ -93,24 +95,28 @@ def set(self, value):
return self._tk.globalsetvar(self._name, value) return self._tk.globalsetvar(self._name, value)
class StringVar(Variable): class StringVar(Variable):
_default = ""
def __init__(self, master=None): def __init__(self, master=None):
Variable.__init__(self, master) Variable.__init__(self, master)
def get(self): def get(self):
return self._tk.globalgetvar(self._name) return self._tk.globalgetvar(self._name)
class IntVar(Variable): class IntVar(Variable):
_default = "0"
def __init__(self, master=None): def __init__(self, master=None):
Variable.__init__(self, master) Variable.__init__(self, master)
def get(self): def get(self):
return self._tk.getint(self._tk.globalgetvar(self._name)) return self._tk.getint(self._tk.globalgetvar(self._name))
class DoubleVar(Variable): class DoubleVar(Variable):
_default = "0.0"
def __init__(self, master=None): def __init__(self, master=None):
Variable.__init__(self, master) Variable.__init__(self, master)
def get(self): def get(self):
return self._tk.getdouble(self._tk.globalgetvar(self._name)) return self._tk.getdouble(self._tk.globalgetvar(self._name))
class BooleanVar(Variable): class BooleanVar(Variable):
_default = "false"
def __init__(self, master=None): def __init__(self, master=None):
Variable.__init__(self, master) Variable.__init__(self, master)
def get(self): def get(self):

6
Lib/tkinter/Tkinter.py
View file

@ -76,6 +76,7 @@ def _exit(code='0'):
_varnum = 0 _varnum = 0
class Variable: class Variable:
_default = ""
def __init__(self, master=None): def __init__(self, master=None):
global _default_root global _default_root
global _varnum global _varnum
@ -85,6 +86,7 @@ def __init__(self, master=None):
self._tk = _default_root.tk self._tk = _default_root.tk
self._name = 'PY_VAR' + `_varnum` self._name = 'PY_VAR' + `_varnum`
_varnum = _varnum + 1 _varnum = _varnum + 1
self.set(self._default)
def __del__(self): def __del__(self):
self._tk.globalunsetvar(self._name) self._tk.globalunsetvar(self._name)
def __str__(self): def __str__(self):
@ -93,24 +95,28 @@ def set(self, value):
return self._tk.globalsetvar(self._name, value) return self._tk.globalsetvar(self._name, value)
class StringVar(Variable): class StringVar(Variable):
_default = ""
def __init__(self, master=None): def __init__(self, master=None):
Variable.__init__(self, master) Variable.__init__(self, master)
def get(self): def get(self):
return self._tk.globalgetvar(self._name) return self._tk.globalgetvar(self._name)
class IntVar(Variable): class IntVar(Variable):
_default = "0"
def __init__(self, master=None): def __init__(self, master=None):
Variable.__init__(self, master) Variable.__init__(self, master)
def get(self): def get(self):
return self._tk.getint(self._tk.globalgetvar(self._name)) return self._tk.getint(self._tk.globalgetvar(self._name))
class DoubleVar(Variable): class DoubleVar(Variable):
_default = "0.0"
def __init__(self, master=None): def __init__(self, master=None):
Variable.__init__(self, master) Variable.__init__(self, master)
def get(self): def get(self):
return self._tk.getdouble(self._tk.globalgetvar(self._name)) return self._tk.getdouble(self._tk.globalgetvar(self._name))
class BooleanVar(Variable): class BooleanVar(Variable):
_default = "false"
def __init__(self, master=None): def __init__(self, master=None):
Variable.__init__(self, master) Variable.__init__(self, master)
def get(self): def get(self):