pyflake cleanup

12 files changed, 19 insertions, 42 deletions

diff --git a/TurtleArt/tablock.py b/TurtleArt/tablock.py
index 0c8c249..f42a9b9 100644
--- a/TurtleArt/tablock.py
+++ b/TurtleArt/tablock.py
@@ -21,7 +21,6 @@
 
 import gtk
 import cairo
-from gettext import gettext as _
 
 from taconstants import EXPANDABLE, EXPANDABLE_ARGS, OLD_NAMES, CONSTANTS, \
     STANDARD_STROKE_WIDTH, BLOCK_SCALE, BOX_COLORS, GRADIENT_COLOR, \
diff --git a/TurtleArt/tacanvas.py b/TurtleArt/tacanvas.py
index 1aac790..a040e4c 100644
--- a/TurtleArt/tacanvas.py
+++ b/TurtleArt/tacanvas.py
@@ -22,19 +22,15 @@
 
 import gtk
 import gobject
-from math import sin, cos, atan, pi, sqrt
+from math import sin, cos, pi
 import os
 import pango
 import cairo
 import pangocairo
-import base64
-from gettext import gettext as _
 
-from sprites import Sprite
-from tasprite_factory import SVG
 from tautils import image_to_base64, get_path, data_to_string, round_int, \
     debug_output
-from taconstants import CONSTANTS, COLORDICT
+from taconstants import COLORDICT
 
 
 def wrap100(n):
@@ -239,7 +235,7 @@ class TurtleGraphics:
         try:
             self.xcor += nn * sin(self.heading * DEGTOR)
             self.ycor += nn * cos(self.heading * DEGTOR)
-        except TypeError, ValueError:
+        except (TypeError, ValueError):
             debug_output('bad value sent to %s' % (__name__),
                          self.tw.running_sugar)
             return
@@ -257,7 +253,7 @@ class TurtleGraphics:
         ''' Set the turtle heading. '''
         try:
             self.heading = n
-        except TypeError, ValueError:
+        except (TypeError, ValueError):
             debug_output('bad value sent to %s' % (__name__),
                          self.tw.running_sugar)
             return
@@ -272,7 +268,7 @@ class TurtleGraphics:
         ''' Rotate turtle clockwise '''
         try:
             self.heading += n
-        except TypeError, ValueError:
+        except (TypeError, ValueError):
             debug_output('bad value sent to %s' % (__name__),
                          self.tw.running_sugar)
             return
@@ -295,7 +291,7 @@ class TurtleGraphics:
                 self.larc(-a, r)
             else:
                 self.rarc(a, r)
-        except TypeError, ValueError:
+        except (TypeError, ValueError):
             debug_output('bad value sent to %s' % (__name__),
                          self.tw.running_sugar)
             return
@@ -311,9 +307,6 @@ class TurtleGraphics:
         if r < 0:
             r = -r
             a = -a
-            s = 0
-        else:
-            s = 1
         oldx, oldy = self.xcor, self.ycor
         cx = self.xcor + r * cos(self.heading * DEGTOR)
         cy = self.ycor - r * sin(self.heading * DEGTOR)
@@ -346,9 +339,6 @@ class TurtleGraphics:
         if r < 0:
             r = -r
             a = -a
-            s = 1
-        else:
-            s = 0
         oldx, oldy = self.xcor, self.ycor
         cx = self.xcor - r * cos(self.heading * DEGTOR)
         cy = self.ycor + r * sin(self.heading * DEGTOR)
@@ -382,7 +372,7 @@ class TurtleGraphics:
         y *= self.tw.coord_scale
         try:
             self.xcor, self.ycor = x, y
-        except TypeError, ValueError:
+        except (TypeError, ValueError):
             debug_output('bad value sent to %s' % (__name__),
                          self.tw.running_sugar)
             return
@@ -410,7 +400,7 @@ class TurtleGraphics:
             if ps < 0:
                 ps = 0
             self.pensize = ps
-        except TypeError, ValueError:
+        except (TypeError, ValueError):
             debug_output('bad value sent to %s' % (__name__),
                          self.tw.running_sugar)
             return
@@ -438,7 +428,7 @@ class TurtleGraphics:
 
         try:
             self.color = c
-        except TypeError, ValueError:
+        except (TypeError, ValueError):
             debug_output('bad value sent to %s' % (__name__),
                          self.tw.running_sugar)
             return
@@ -453,7 +443,7 @@ class TurtleGraphics:
         ''' Set the gray level '''
         try:
             self.gray = g
-        except TypeError, ValueError:
+        except (TypeError, ValueError):
             debug_output('bad value sent to %s' % (__name__),
                          self.tw.running_sugar)
             return
@@ -480,7 +470,7 @@ class TurtleGraphics:
         ''' Set the text size '''
         try:
             self.tw.textsize = c
-        except TypeError, ValueError:
+        except (TypeError, ValueError):
             debug_output('bad value sent to %s' % (__name__),
                          self.tw.running_sugar)
 
@@ -488,7 +478,7 @@ class TurtleGraphics:
         ''' Set the color shade '''
         try:
             self.shade = s
-        except TypeError, ValueError:
+        except (TypeError, ValueError):
             debug_output('bad value sent to %s' % (__name__),
                          self.tw.running_sugar)
             return
diff --git a/TurtleArt/tacollaboration.py b/TurtleArt/tacollaboration.py
index e9bc149..55c4e12 100644
--- a/TurtleArt/tacollaboration.py
+++ b/TurtleArt/tacollaboration.py
@@ -24,7 +24,6 @@ from dbus.gobject_service import ExportedGObject
 import telepathy
 import os
 import gtk
-import base64
 
 from gettext import gettext as _
 
@@ -115,7 +114,7 @@ class Collaboration():
         debug_output('This is my activity: making a tube...',
                      self._tw.running_sugar)
 
-        id = self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].OfferDBusTube(
+        self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].OfferDBusTube(
             SERVICE, {})
         self._enable_share_button()
 
diff --git a/TurtleArt/taexportlogo.py b/TurtleArt/taexportlogo.py
index 0d0660e..7fea030 100644
--- a/TurtleArt/taexportlogo.py
+++ b/TurtleArt/taexportlogo.py
@@ -18,8 +18,6 @@
 #OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #THE SOFTWARE.
 
-from gettext import gettext as _
-
 try:
     from sugar.datastore import datastore
     HAS_DATASTORE = True
diff --git a/TurtleArt/tagplay.py b/TurtleArt/tagplay.py
index c0ecd58..335c25f 100644
--- a/TurtleArt/tagplay.py
+++ b/TurtleArt/tagplay.py
@@ -32,7 +32,6 @@ pygtk.require('2.0')
 import gobject
 gobject.threads_init()
 
-import pygst
 import gst
 import gst.interfaces
 import gtk
diff --git a/TurtleArt/tajail.py b/TurtleArt/tajail.py
index 0444dc7..3fcf997 100644
--- a/TurtleArt/tajail.py
+++ b/TurtleArt/tajail.py
@@ -23,7 +23,6 @@ import traceback
 from time import *
 from math import *
 
-from gettext import gettext as _
 
 def myfunc(f, args):
     ''' Run inline Python code '''
diff --git a/TurtleArt/talogo.py b/TurtleArt/talogo.py
index 19150b3..316b314 100644
--- a/TurtleArt/talogo.py
+++ b/TurtleArt/talogo.py
@@ -738,8 +738,6 @@ class LogoCode:
                 debug_output("Couldn't open filepath %s" % (self.filepath),
                              self.tw.running_sugar)
         if self.pixbuf is not None:
-            x = self.tw.canvas.xcor
-            y = self.tw.canvas.ycor
             w *= self.tw.coord_scale
             h *= self.tw.coord_scale
             if center:
diff --git a/TurtleArt/taturtle.py b/TurtleArt/taturtle.py
index e3d6e39..91118de 100644
--- a/TurtleArt/taturtle.py
+++ b/TurtleArt/taturtle.py
@@ -21,7 +21,6 @@
 
 from random import uniform
 from math import sin, cos, pi, sqrt
-from gettext import gettext as _
 import gtk
 import cairo
 
diff --git a/TurtleArt/tautils.py b/TurtleArt/tautils.py
index 30bf986..a8e372c 100644
--- a/TurtleArt/tautils.py
+++ b/TurtleArt/tautils.py
@@ -25,7 +25,6 @@ import pickle
 import subprocess
 import os
 import string
-from string import find
 from gettext import gettext as _
 
 try:
@@ -43,7 +42,7 @@ except (ImportError, AttributeError):
         OLD_SUGAR_SYSTEM = True
 from StringIO import StringIO
 
-from taconstants import (HIT_HIDE, HIT_SHOW, XO1, XO15, XO175, XO30, XO4,
+from taconstants import (HIT_HIDE, HIT_SHOW, XO1, XO15, XO175, XO4,
                          UNKNOWN, MAGICNUMBER, SUFFIX)
 
 import logging
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index 4749ca2..73c1f5d 100644
--- a/TurtleArt/tawindow.py
+++ b/TurtleArt/tawindow.py
@@ -28,7 +28,6 @@ import gtk
 import gobject
 import pango
 import pangocairo
-from StringIO import StringIO
 
 from gettext import gettext as _
 
@@ -69,7 +68,7 @@ from tautils import (magnitude, get_load_name, get_save_name, data_from_file,
     calc_image_size, get_path, hide_button_hit, show_button_hit, chooser,
     arithmetic_check, xy, find_block_to_run, find_top_block, journal_check,
     find_group, find_blk_below, data_to_string, find_start_stack,
-    get_hardware, debug_output, error_output, data_to_string, convert,
+    get_hardware, debug_output, error_output, convert,
     find_bot_block, restore_clamp, collapse_clamp, data_from_string,
     increment_name, get_screen_dpi)
 from tasprite_factory import SVG, svg_str_to_pixbuf, svg_from_file
@@ -265,7 +264,7 @@ class TurtleArtWindow():
         self.lc = LogoCode(self)
 
         from tabasics import Palettes
-        p = Palettes(self)
+        Palettes(self)
         self._setup_plugins()
 
         if self.interactive_mode:
@@ -1530,7 +1529,6 @@ class TurtleArtWindow():
                          self.running_sugar)
             '''
             return
-        found = False
 
         if old in block_styles[style]:
             block_styles[style].remove(old)
@@ -3061,10 +3059,8 @@ may not terminate.', False)
         keyunicode = gtk.gdk.keyval_to_unicode(event.keyval)
         if event.get_state() & gtk.gdk.MOD1_MASK:
             alt_mask = True
-            alt_flag = 'T'
         else:
             alt_mask = False
-            alt_flag = 'F'
         self._key_press(alt_mask, keyname, keyunicode)
         return keyname
 
diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py
index b65dc87..b5b357b 100644
--- a/TurtleArtActivity.py
+++ b/TurtleArtActivity.py
@@ -56,7 +56,7 @@ from gettext import gettext as _
 
 from TurtleArt.tapalette import palette_names, help_strings, help_palettes, \
                                 help_windows
-from TurtleArt.taconstants import ICON_SIZE, BLOCK_SCALE, XO1, XO15, XO175, \
+from TurtleArt.taconstants import BLOCK_SCALE, XO1, XO15, XO175, \
                                   XO30, XO4, MIMETYPE
 from TurtleArt.taexportlogo import save_logo
 from TurtleArt.tautils import data_to_file, data_to_string, data_from_string, \
diff --git a/turtleblocks.py b/turtleblocks.py
index 8a683d0..19da326 100755
--- a/turtleblocks.py
+++ b/turtleblocks.py
@@ -621,7 +621,8 @@ class TurtleMain():
         about.set_version(self.version)
         about.set_comments(_(self.summary))
         about.set_website(self.website)
-        about.set_logo(gtk.gdk.pixbuf_new_from_file('activity/' + self.icon_name + '.svg'))
+        about.set_logo(gtk.gdk.pixbuf_new_from_file(
+                'activity/' + self.icon_name + '.svg'))
         about.run()
         about.destroy()