Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Don't rename Tkinter to Tk; closes bug 115714 

Subclass Error from Exception.
This commit is contained in:
Martin v. Löwis 2000-10-01 17:52:01 +00:00
parent 145f96eb36
commit 4b6ea798cb
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Lib/lib-tk/turtle.py
View File

@ -2,8 +2,8 @@
from math import * # Also for export from math import * # Also for export
import Tkinter import Tkinter
Tk = Tkinter class Error(Exception):
Error = Exception pass
class RawPen: class RawPen:
@ -85,7 +85,7 @@ class RawPen:
# Test the color first # Test the color first
try: try:
id = self._canvas.create_line(0, 0, 0, 0, fill=color) id = self._canvas.create_line(0, 0, 0, 0, fill=color)
except Tk.TclError: except Tkinter.TclError:
raise Error, "bad color string: %s" % `color` raise Error, "bad color string: %s" % `color`
self._color = color self._color = color
return return
@ -222,7 +222,7 @@ class RawPen:
self._canvas.update() self._canvas.update()
self._canvas.after(10) self._canvas.after(10)
self._canvas.itemconfigure(item, arrow="none") self._canvas.itemconfigure(item, arrow="none")
except Tk.TclError: except Tkinter.TclError:
# Probably the window was closed! # Probably the window was closed!
return return
else: else:
@ -242,11 +242,11 @@ class Pen(RawPen):
def __init__(self): def __init__(self):
global _root, _canvas global _root, _canvas
if _root is None: if _root is None:
_root = Tk.Tk() _root = Tkinter.Tk()
_root.wm_protocol("WM_DELETE_WINDOW", self._destroy) _root.wm_protocol("WM_DELETE_WINDOW", self._destroy)
if _canvas is None: if _canvas is None:
# XXX Should have scroll bars # XXX Should have scroll bars
_canvas = Tk.Canvas(_root, background="white") _canvas = Tkinter.Canvas(_root, background="white")
_canvas.pack(expand=1, fill="both") _canvas.pack(expand=1, fill="both")
RawPen.__init__(self, _canvas) RawPen.__init__(self, _canvas)