diff options
author | Walter Bender <walter.bender@gmail.com> | 2011-11-08 00:12:29 (GMT) |
---|---|---|
committer | Walter Bender <walter.bender@gmail.com> | 2011-11-08 00:12:29 (GMT) |
commit | 4739976d0a96eb21b8f606c69ecc09ca7a1557de (patch) | |
tree | 57170dde71aee01aac39059ebd300a3e5aa9e7e3 /TurtleArt/taturtle.py | |
parent | b81f399d5c57465e95cca0fac241975bc75df303 (diff) | |
parent | a7a87c7fa872418f8db1af7badd4c91e0481c2af (diff) |
Merge commit 'refs/merge-requests/3' of git://git.sugarlabs.org/turtleart/mainline into integration
Conflicts:
NEWS
activity/activity.info
Diffstat (limited to 'TurtleArt/taturtle.py')
-rw-r--r-- | TurtleArt/taturtle.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/TurtleArt/taturtle.py b/TurtleArt/taturtle.py index 0ca72e4..c7bb768 100644 --- a/TurtleArt/taturtle.py +++ b/TurtleArt/taturtle.py @@ -25,7 +25,7 @@ from gettext import gettext as _ from taconstants import TURTLE_LAYER, DEFAULT_TURTLE_COLORS from tasprite_factory import SVG, svg_str_to_pixbuf -from tacanvas import wrap100, color_table +from tacanvas import wrap100, COLOR_TABLE from sprites import Sprite from tautils import debug_output @@ -161,8 +161,8 @@ class Turtle: elif use_color_table: fill = wrap100(int_key) stroke = wrap100(fill + 10) - self.colors = ['#%06x' % (color_table[fill]), - '#%06x' % (color_table[stroke])] + self.colors = ['#%06x' % (COLOR_TABLE[fill]), + '#%06x' % (COLOR_TABLE[stroke])] self.shapes = generate_turtle_pixbufs(self.colors) else: if turtles is not None: |