Don't rename Tkinter to Tk; closes bug 115714
Subclass Error from Exception.
diff --git a/Lib/lib-tk/turtle.py b/Lib/lib-tk/turtle.py
index 49375a7..7c956ee 100644
--- a/Lib/lib-tk/turtle.py
+++ b/Lib/lib-tk/turtle.py
@@ -2,8 +2,8 @@
from math import * # Also for export
import Tkinter
-Tk = Tkinter
-Error = Exception
+class Error(Exception):
+ pass
class RawPen:
@@ -85,7 +85,7 @@
# Test the color first
try:
id = self._canvas.create_line(0, 0, 0, 0, fill=color)
- except Tk.TclError:
+ except Tkinter.TclError:
raise Error, "bad color string: %s" % `color`
self._color = color
return
@@ -222,7 +222,7 @@
self._canvas.update()
self._canvas.after(10)
self._canvas.itemconfigure(item, arrow="none")
- except Tk.TclError:
+ except Tkinter.TclError:
# Probably the window was closed!
return
else:
@@ -242,11 +242,11 @@
def __init__(self):
global _root, _canvas
if _root is None:
- _root = Tk.Tk()
+ _root = Tkinter.Tk()
_root.wm_protocol("WM_DELETE_WINDOW", self._destroy)
if _canvas is None:
# XXX Should have scroll bars
- _canvas = Tk.Canvas(_root, background="white")
+ _canvas = Tkinter.Canvas(_root, background="white")
_canvas.pack(expand=1, fill="both")
RawPen.__init__(self, _canvas)