Bug #3884: Make the turtle module toplevel again.

20 files changed, 20 insertions, 18 deletions

diff --git a/Demo/turtle/tdemo_I_dontlike_tiltdemo.py b/Demo/turtle/tdemo_I_dontlike_tiltdemo.py
index 7cae675..1d8652c 100644
--- a/Demo/turtle/tdemo_I_dontlike_tiltdemo.py
+++ b/Demo/turtle/tdemo_I_dontlike_tiltdemo.py
@@ -12,7 +12,7 @@ We can remove it, if you don't like it.
       Without using reset() ;-)
  ---------------------------------------
 """
-from tkinter.turtle import *
+from turtle import *
 import time
 
 def main():
diff --git a/Demo/turtle/tdemo_bytedesign.py b/Demo/turtle/tdemo_bytedesign.py
index 742df06..2e2ac62 100644
--- a/Demo/turtle/tdemo_bytedesign.py
+++ b/Demo/turtle/tdemo_bytedesign.py
@@ -23,7 +23,7 @@ mode as fast as possible.
 """
 
 import math
-from tkinter.turtle import Turtle, mainloop
+from turtle import Turtle, mainloop
 from time import clock
 
 # wrapper for any additional drawing routines
diff --git a/Demo/turtle/tdemo_chaos.py b/Demo/turtle/tdemo_chaos.py
index 73a0453..55b4bbd 100644
--- a/Demo/turtle/tdemo_chaos.py
+++ b/Demo/turtle/tdemo_chaos.py
@@ -4,7 +4,7 @@
 
 # Ein einfaches Programm zur Demonstration von "chaotischem Verhalten".
 
-from tkinter.turtle import *
+from turtle import *
 
 def f(x):
     return 3.9*x*(1-x)
diff --git a/Demo/turtle/tdemo_clock.py b/Demo/turtle/tdemo_clock.py
index c91d4c5..e186c38 100644
--- a/Demo/turtle/tdemo_clock.py
+++ b/Demo/turtle/tdemo_clock.py
@@ -10,7 +10,7 @@ and time
    Press STOP to exit the program!
   ------------------------------------
 """
-from tkinter.turtle import *
+from turtle import *
 from datetime import datetime
 
 mode("logo")
diff --git a/Demo/turtle/tdemo_colormixer.py b/Demo/turtle/tdemo_colormixer.py
index 93179b3..f5d308d 100644
--- a/Demo/turtle/tdemo_colormixer.py
+++ b/Demo/turtle/tdemo_colormixer.py
@@ -1,6 +1,6 @@
 # colormixer
 
-from tkinter.turtle import Screen, Turtle, mainloop
+from turtle import Screen, Turtle, mainloop
 import sys
 sys.setrecursionlimit(20000)   # overcomes, for now, an instability of Python 3.0
 
diff --git a/Demo/turtle/tdemo_forest.py b/Demo/turtle/tdemo_forest.py
index b117e3b..01fa186 100644
--- a/Demo/turtle/tdemo_forest.py
+++ b/Demo/turtle/tdemo_forest.py
@@ -11,7 +11,7 @@ This example is a 'breadth-first'-rewrite of
 a Logo program written by Erich Neuwirth. See:
 http://homepage.univie.ac.at/erich.neuwirth/
 """
-from tkinter.turtle import Turtle, colormode, tracer, mainloop
+from turtle import Turtle, colormode, tracer, mainloop
 from random import randrange
 from time import clock
 
diff --git a/Demo/turtle/tdemo_fractalcurves.py b/Demo/turtle/tdemo_fractalcurves.py
index b7c387b..247f16c 100644
--- a/Demo/turtle/tdemo_fractalcurves.py
+++ b/Demo/turtle/tdemo_fractalcurves.py
@@ -11,7 +11,7 @@ The CurvesTurtle class and the fractal-curve-
 methods are taken from the PythonCard example
 scripts for turtle-graphics.
 """
-from tkinter.turtle import *
+from turtle import *
 from time import sleep, clock
 
 class CurvesTurtle(Pen):
diff --git a/Demo/turtle/tdemo_lindenmayer_indian.py b/Demo/turtle/tdemo_lindenmayer_indian.py
index 07dd936..bda5067 100644
--- a/Demo/turtle/tdemo_lindenmayer_indian.py
+++ b/Demo/turtle/tdemo_lindenmayer_indian.py
@@ -25,7 +25,7 @@ Cultures
 # Mini Lindenmayer tool
 ###############################
 
-from tkinter.turtle import *
+from turtle import *
 
 def replace( seq, replacementRules, n ):
     for i in range(n):
diff --git a/Demo/turtle/tdemo_minimal_hanoi.py b/Demo/turtle/tdemo_minimal_hanoi.py
index 97e937f..a8bdca7 100644
--- a/Demo/turtle/tdemo_minimal_hanoi.py
+++ b/Demo/turtle/tdemo_minimal_hanoi.py
@@ -17,7 +17,7 @@ stretched to rectangles by shapesize()
        To exit press STOP button
  ---------------------------------------
 """
-from tkinter.turtle import *
+from turtle import *
 
 class Disc(Turtle):
     def __init__(self, n):
diff --git a/Demo/turtle/tdemo_paint.py b/Demo/turtle/tdemo_paint.py
index 97c8756..337a57c 100644
--- a/Demo/turtle/tdemo_paint.py
+++ b/Demo/turtle/tdemo_paint.py
@@ -15,7 +15,7 @@ A simple  eventdriven paint program
           To exit press STOP button
  -------------------------------------------
 """
-from tkinter.turtle import *
+from turtle import *
 
 def switchupdown(x=0, y=0):
     if pen()["pendown"]:
diff --git a/Demo/turtle/tdemo_peace.py b/Demo/turtle/tdemo_peace.py
index 7f7db14..ea57069 100644
--- a/Demo/turtle/tdemo_peace.py
+++ b/Demo/turtle/tdemo_peace.py
@@ -13,7 +13,7 @@ Intentionally no variables are used except for the
 colorloop:
 """
 
-from tkinter.turtle import *
+from turtle import *
 
 def main():
     peacecolors = ("red3",  "orange", "yellow",
diff --git a/Demo/turtle/tdemo_penrose.py b/Demo/turtle/tdemo_penrose.py
index e99a5f5..f816f66 100644
--- a/Demo/turtle/tdemo_penrose.py
+++ b/Demo/turtle/tdemo_penrose.py
@@ -15,7 +15,7 @@ For more information see:
  http://en.wikipedia.org/wiki/Penrose_tiling
  -------------------------------------------
 """
-from tkinter.turtle import *
+from turtle import *
 from math import cos, pi
 from time import clock, sleep
 
diff --git a/Demo/turtle/tdemo_planet_and_moon.py b/Demo/turtle/tdemo_planet_and_moon.py
index 855b56f..983449c 100644
--- a/Demo/turtle/tdemo_planet_and_moon.py
+++ b/Demo/turtle/tdemo_planet_and_moon.py
@@ -17,7 +17,7 @@ the left mouse button with mouse over the
 scrollbar of the canvas.
 
 """
-from tkinter.turtle import Shape, Turtle, mainloop, Vec2D as Vec
+from turtle import Shape, Turtle, mainloop, Vec2D as Vec
 from time import sleep
 
 G = 8
diff --git a/Demo/turtle/tdemo_tree.py b/Demo/turtle/tdemo_tree.py
index 3e7f34f..fda653c 100644
--- a/Demo/turtle/tdemo_tree.py
+++ b/Demo/turtle/tdemo_tree.py
@@ -15,7 +15,7 @@ always yields None.
 current pen is cloned. So in the end there
 are 1024 turtles.
 """
-from tkinter.turtle import Turtle, mainloop
+from turtle import Turtle, mainloop
 from time import clock
 
 def tree(plist, l, a, f):
diff --git a/Demo/turtle/tdemo_wikipedia.py b/Demo/turtle/tdemo_wikipedia.py
index f694312..73e03d2 100644
--- a/Demo/turtle/tdemo_wikipedia.py
+++ b/Demo/turtle/tdemo_wikipedia.py
@@ -13,7 +13,7 @@ parallel.
 
 Followed by a complete undo().
 """
-from tkinter.turtle import Screen, Turtle, mainloop
+from turtle import Screen, Turtle, mainloop
 from time import clock, sleep
 
 def mn_eck(p, ne,sz):
diff --git a/Demo/turtle/tdemo_yinyang.py b/Demo/turtle/tdemo_yinyang.py
index a47dd71..6508b44 100644
--- a/Demo/turtle/tdemo_yinyang.py
+++ b/Demo/turtle/tdemo_yinyang.py
@@ -11,7 +11,7 @@ command.
 
 """
 
-from tkinter.turtle import *
+from turtle import *
 
 def yin(radius, color1, color2):
     width(3)
diff --git a/Demo/turtle/turtleDemo.py b/Demo/turtle/turtleDemo.py
index a454382..b73daf0 100644
--- a/Demo/turtle/turtleDemo.py
+++ b/Demo/turtle/turtleDemo.py
@@ -8,7 +8,7 @@ from idlelib.ColorDelegator import ColorDelegator
 from idlelib.textView import view_file # TextViewer
 from imp import reload
 
-from tkinter import turtle
+import turtle
 import time
 
 STARTUP = 1
diff --git a/Demo/turtle/turtledemo_two_canvases.py b/Demo/turtle/turtledemo_two_canvases.py
index 4fdb59a..57ecb1d 100644
--- a/Demo/turtle/turtledemo_two_canvases.py
+++ b/Demo/turtle/turtledemo_two_canvases.py
@@ -3,7 +3,7 @@
 """turtle example: Using TurtleScreen and RawTurtle
 for drawing on two distinct canvases.
 """
-from tkinter.turtle import TurtleScreen, RawTurtle, TK
+from turtle import TurtleScreen, RawTurtle, TK
 
 root = TK.Tk()
 cv1 = TK.Canvas(root, width=300, height=200, bg="#ddffff")
diff --git a/Lib/tkinter/turtle.py b/Lib/turtle.py
index 1497d2d..1497d2d 100644
--- a/Lib/tkinter/turtle.py
+++ b/Lib/turtle.py
diff --git a/Misc/NEWS b/Misc/NEWS
index 5daea2f..f4b302a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -15,6 +15,8 @@ Core and Builtins
 Library
 -------
 
+- Bug #3884: Make the turtle module toplevel again.
+
 
 What's New in Python 3.0 release candidate 1
 ============================================