From 6acdbc3db543f2692ee336a99722f5ab0b46c77e Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@sugarlabs.org>
Date: Wed, 13 Nov 2013 22:42:18 +0000
Subject: convert to new primitive type

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

diff --git a/TurtleArt/tacanvas.py b/TurtleArt/tacanvas.py
index 89b8ed1..4bac442 100644
--- a/TurtleArt/tacanvas.py
+++ b/TurtleArt/tacanvas.py
@@ -1,4 +1,4 @@
-31#Copyright (c) 2007-8, Playful Invention Company.
+#Copyright (c) 2007-8, Playful Invention Company.
 #Copyright (c) 2008-11, Walter Bender
 #Copyright (c) 2011 Collabora Ltd. <http://www.collabora.co.uk/>
 
@@ -28,7 +28,7 @@ import cairo
 import pangocairo
 
 from tautils import get_path
-from taconstants import COLORDICT, TMP_SVG_PATH
+from taconstants import Color, TMP_SVG_PATH
 
 
 def wrap100(n):
@@ -208,19 +208,19 @@ class TurtleGraphics:
         save_rgb = self._fgrgb[:]
 
         # Special case for color blocks
-        if color in COLORDICT:
-            if COLORDICT[color][0] is None:
-                self._shade = COLORDICT[color][1]
+        if isinstance(color, Color):
+            if color.color is None:
+                self._shade = color.shade
             else:
-                self._color = COLORDICT[color][0]
+                self._color = color.color
         else:
             self._color = color
-        if shade in COLORDICT:
-            self._shade = COLORDICT[shade][1]
+        if isinstance(shade, Color):
+            self._shade = shade.shade
         else:
             self._shade = shade
-        if gray in COLORDICT:
-            self._gray = COLORDICT[gray][2]
+        if isinstance(gray, Color):
+            self._gray = gray.gray
         else:
             self._gray = gray
 
--
cgit v0.9.1