From 8f68c11d91276cf2d32cee65578f775b5f51edc8 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Sat, 24 Mar 2012 16:14:20 +0000
Subject: using hasattr instead of catching AttributionError

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

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']:
--
cgit v0.9.1