diff options
author | Walter Bender <walter.bender@gmail.com> | 2011-02-21 23:00:50 (GMT) |
---|---|---|
committer | Walter Bender <walter.bender@gmail.com> | 2011-02-21 23:00:50 (GMT) |
commit | aa2d1d42f01f87b5a0a7e533bb6a93d3720b9d1a (patch) | |
tree | 7c6a4d820e001530082045875676f44e65280203 /TurtleArt/taturtle.py | |
parent | e262536e85ce5289bd5eaafa157939ed8657fdab (diff) | |
parent | 860754f7e871617df9d101a51dc64a69b742a0ba (diff) |
Merge git.sugarlabs.org:~walter/turtleart/collaboration-refactoring
Conflicts:
NEWS
TurtleArt/talogo.py
Diffstat (limited to 'TurtleArt/taturtle.py')
-rw-r--r-- | TurtleArt/taturtle.py | 4 |
1 files changed, 2 insertions, 2 deletions
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): |