From e108487cff19177002f60f1d754f9a205fb91d15 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@sugarlabs.org>
Date: Fri, 30 Aug 2013 20:27:37 +0000
Subject: merge from mzepf set_xy takes x, y instead of (x, y)

---
(limited to 'TurtleArt/taturtle.py')

diff --git a/TurtleArt/taturtle.py b/TurtleArt/taturtle.py
index 1ed557c..8d2afea 100644
--- a/TurtleArt/taturtle.py
+++ b/TurtleArt/taturtle.py
@@ -157,7 +157,7 @@ class Turtles:
             # if it is a new turtle, start it in the center of the screen
             self._active_turtle = self.get_turtle(turtle_name, True, colors)
             self._active_turtle.set_heading(0.0, False)
-            self._active_turtle.set_xy((0.0, 0.0), False, pendown=False)
+            self._active_turtle.set_xy(0.0, 0.0, False, pendown=False)
             self._active_turtle.set_pen_state(True)
         elif colors is not None:
             self._active_turtle = self.get_turtle(turtle_name, False)
@@ -562,16 +562,15 @@ class Turtle:
                                               int(distance)]))
             self._turtles.turtle_window.send_event(event)
 
-    def set_xy(self, pos, share=True, pendown=True, dragging=False):
+    def set_xy(self, x, y, share=True, pendown=True, dragging=False):
         old = self.get_xy()
-
         try:
             if dragging:
-                xcor = pos[0]
-                ycor = pos[1]
+                xcor = x
+                ycor = y
             else:
-                xcor = pos[0] * self._turtles.turtle_window.coord_scale
-                ycor = pos[1] * self._turtles.turtle_window.coord_scale
+                xcor = x * self._turtles.turtle_window.coord_scale
+                ycor = y * self._turtles.turtle_window.coord_scale
         except (TypeError, ValueError):
             debug_output('bad value sent to %s' % (__name__),
                          self._turtles.turtle_window.running_sugar)
--
cgit v0.9.1