From aa2d1d42f01f87b5a0a7e533bb6a93d3720b9d1a Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Mon, 21 Feb 2011 23:00:50 +0000
Subject: Merge git.sugarlabs.org:~walter/turtleart/collaboration-refactoring

Conflicts:
	NEWS
	TurtleArt/talogo.py
---
(limited to 'TurtleArt/taturtle.py')

diff --git a/TurtleArt/taturtle.py b/TurtleArt/taturtle.py
index a7a3205..f309eef 100644
--- a/TurtleArt/taturtle.py
+++ b/TurtleArt/taturtle.py
@@ -19,7 +19,7 @@
 #OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #THE SOFTWARE.
 
-from taconstants import TURTLE_LAYER
+from taconstants import TURTLE_LAYER, DEFAULT_TURTLE_COLORS
 from tasprite_factory import SVG, svg_str_to_pixbuf
 from tacanvas import wrap100, color_table
 from sprites import Sprite
@@ -149,7 +149,7 @@ class Turtle:
             self.shapes = generate_turtle_pixbufs(self.colors)
         else:
             if turtles is not None:
-                self.colors = ['#008000', '#00A000']
+                self.colors = DEFAULT_TURTLE_COLORS
                 self.shapes = turtles.get_pixbufs()
 
     def set_shapes(self, shapes):
--
cgit v0.9.1