From 3c3098c35b1326eb83e7802bdb9d09839ba7bf2d Mon Sep 17 00:00:00 2001
From: Pootle daemon <pootle@pootle.sugarlabs.org>
Date: Tue, 08 Oct 2013 18:46:05 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:turtleart/mainline

---
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index 383d513..2bd720e 100644
--- a/TurtleArt/tawindow.py
+++ b/TurtleArt/tawindow.py
@@ -409,7 +409,7 @@ class TurtleArtWindow():
                 plugin.setup()
             except Exception as e:
                 debug_output('Plugin %s failed during setup: %s' %
-                             (plugin_class, str(e)), self.running_sugar)
+                             (plugin, str(e)), self.running_sugar)
                 # If setup fails, remove the plugin from the list
                 self.turtleart_plugins.remove(plugin)
 
@@ -421,7 +421,7 @@ class TurtleArtWindow():
                     plugin.start()
                 except Exception as e:
                     debug_output('Plugin %s failed during start: %s' %
-                                 (plugin_class, str(e)), self.running_sugar)
+                                 (plugin, str(e)), self.running_sugar)
 
     def stop_plugins(self):
         ''' Stop is called whenever we stop execution. '''
@@ -431,7 +431,7 @@ class TurtleArtWindow():
                     plugin.stop()
                 except Exception as e:
                     debug_output('Plugin %s failed during stop: %s' %
-                                 (plugin_class, str(e)), self.running_sugar)
+                                 (plugin, str(e)), self.running_sugar)
 
     def clear_plugins(self):
         ''' Clear is called from the clean block and erase button. '''
@@ -441,7 +441,7 @@ class TurtleArtWindow():
                     plugin.clear()
                 except Exception as e:
                     debug_output('Plugin %s failed during clear: %s' %
-                                 (plugin_class, str(e)), self.running_sugar)
+                                 (plugin, str(e)), self.running_sugar)
 
     def background_plugins(self):
         ''' Background is called when we are pushed to the background. '''
@@ -451,7 +451,7 @@ class TurtleArtWindow():
                     plugin.goto_background()
                 except Exception as e:
                     debug_output('Plugin %s failed during background: %s' %
-                                 (plugin_class, str(e)), self.running_sugar)
+                                 (plugin, str(e)), self.running_sugar)
 
     def foreground_plugins(self):
         ''' Foreground is called when we are return from the background. '''
@@ -461,7 +461,7 @@ class TurtleArtWindow():
                     plugin.return_to_foreground()
                 except Exception as e:
                     debug_output('Plugin %s failed during foreground: %s' %
-                                 (plugin_class, str(e)), self.running_sugar)
+                                 (plugin, str(e)), self.running_sugar)
 
     def quit_plugins(self):
         ''' Quit is called upon program exit. '''
@@ -471,7 +471,7 @@ class TurtleArtWindow():
                     plugin.quit()
                 except Exception as e:
                     debug_output('Plugin %s failed during quit: %s' %
-                                 (plugin_class, str(e)), self.running_sugar)
+                                 (plugin, str(e)), self.running_sugar)
 
     def _setup_events(self):
         ''' Register the events we listen to. '''
--
cgit v0.9.1