From 43fe0dd1cce66717adc2903404dc635181b380c7 Mon Sep 17 00:00:00 2001
From: Pootle daemon <pootle@pootle.sugarlabs.org>
Date: Sat, 24 Mar 2012 21:54:14 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:turtleart/mainline

---
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index e5984d2..20eeb34 100644
--- a/TurtleArt/tawindow.py
+++ b/TurtleArt/tawindow.py
@@ -765,10 +765,10 @@ class TurtleArtWindow():
             self._layout_palette(n, regenerate=regenerate, show=False)
         for blk in self.palettes[n]:
             if blk.get_visibility():
-                try:
+                if hasattr(blk.spr, 'set_layer'):
                     blk.spr.set_layer(PROTO_LAYER)
-                except AttributeError:
-                    debug_output('block sprite is None' % (blk.name),
+                else:
+                    debug_output('WARNING: block sprite is None' % (blk.name),
                                  self.running_sugar)
             else:
                 blk.spr.hide()
@@ -883,12 +883,12 @@ class TurtleArtWindow():
                 if name in hidden_proto_blocks:
                     self.palettes[n][-1].set_visibility(False)
                 else:
-                    try:
+                    if hasattr(self.palettes[n][-1].spr, 'set_layer'):
                         self.palettes[n][-1].spr.set_layer(PROTO_LAYER)
                         self.palettes[n][-1].unhighlight()
-                    except AttributeError:
-                        debug_output('block sprite is None' % (blk.name),
-                                     self.running_sugar)
+                    else:
+                        debug_output('WARNING: block sprite is None' % (
+                                self.palettes[n][-1].name), self.running_sugar)
 
             # Some proto blocks get a skin.
             if name in block_styles['box-style-media']:
diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py
index 147f199..b7c98f7 100644
--- a/TurtleArtActivity.py
+++ b/TurtleArtActivity.py
@@ -263,7 +263,6 @@ class TurtleArtActivity(activity.Activity):
         if not self.has_toolbarbox:
             self.palette_buttons[i].set_icon(palette_names[i] + 'on')
         else:
-            _logger.debug('setting help button palette to %s' % (palette_names[i]))
             self._help_button.set_current_palette(palette_names[i])
         self.tw.show_palette(n=i)
         self.do_showpalette()
@@ -271,12 +270,10 @@ class TurtleArtActivity(activity.Activity):
     def _do_hover_help_toggle(self, button):
         ''' Toggle hover help '''
         if self.tw.no_help:
-            _logger.debug('turning hover help on')
             self.tw.no_help = False
             self._hover_help_toggle.set_icon('help-off')
             self._hover_help_toggle.set_tooltip(_('Turn off hover help'))
         else:
-            _logger.debug('turning hover help off')
             self.tw.no_help = True
             self.tw.last_label = None
             self.tw.status_spr.hide()
--
cgit v0.9.1