Merge with 3.4

1 files changed, 5 insertions, 21 deletions

diff --git a/Lib/turtledemo/__main__.py b/Lib/turtledemo/__main__.py
index 2aa8f1b23f..f7eac9a107 100755
--- a/Lib/turtledemo/__main__.py
+++ b/Lib/turtledemo/__main__.py
@@ -318,27 +318,11 @@ class DemoWindow(object):
 
     def _destroy(self):
         self.root.destroy()
-        sys.exit()
 
 
-if __name__ == '__main__':
+def main():
     demo = DemoWindow()
-    RUN = True
-    while RUN:
-        try:
-            #print("ENTERING mainloop")
-            demo.root.mainloop()
-        except AttributeError:
-            #print("AttributeError!- WAIT A MOMENT!")
-            time.sleep(0.3)
-            print("GOING ON ..")
-            demo.ckearCanvas()
-        except TypeError:
-            demo.screen._delete("all")
-            #print("CRASH!!!- WAIT A MOMENT!")
-            time.sleep(0.3)
-            #print("GOING ON ..")
-            demo.clearCanvas()
-        except:
-            print("BYE!")
-            RUN = False
+    demo.root.mainloop()
+
+if __name__ == '__main__':
+    main()