pyflakes

13 files changed, 32 insertions, 31 deletions

diff --git a/examples/gtk/bin.py b/examples/gtk/bin.py
index 273c3ab0..fa8d7afa 100644
--- a/examples/gtk/bin.py
+++ b/examples/gtk/bin.py
@@ -1,5 +1,4 @@
 # A simple gtk.Conatiner subclassing example reimplementing gtk.Bin in python
-import gobject
 import gtk
 
 class Bin(gtk.Container):
diff --git a/examples/ide/edit.py b/examples/ide/edit.py
index 83a25c6d..6e34e8b0 100644
--- a/examples/ide/edit.py
+++ b/examples/ide/edit.py
@@ -2,10 +2,10 @@
 
 # This is a sample implementation of an editor.
 
-import pygtk
-pygtk.require('2.0')
+import os
+import dialogs
+
 import gtk
-import sys, os, dialogs
 
 BLOCK_SIZE = 2048
 RESPONSE_FORWARD = 1
@@ -261,9 +261,9 @@ class EditWindow(gtk.Window):
     def help_about(self, mi):
         dlg = gtk.MessageDialog(self, gtk.DIALOG_DESTROY_WITH_PARENT,
                                 gtk.MESSAGE_INFO, gtk.BUTTONS_OK,
-                                "Copyright (C)\n" \
-                                "1998 James Henstridge\n" \
-                                "2004 John Finlay\n" \
+                                "Copyright (C)\n"
+                                "1998 James Henstridge\n"
+                                "2004 John Finlay\n"
                                 "This program is covered by the GPL>=2")
         dlg.run()
         dlg.hide()
diff --git a/examples/ide/pyide.py b/examples/ide/pyide.py
index cefcac2f..9b6ea524 100755
--- a/examples/ide/pyide.py
+++ b/examples/ide/pyide.py
@@ -149,9 +149,9 @@ class Application(gtk.Window):
         return
     def debug_script(self, fname):
         if not fname or not os.path.exists(fname):
-            gtk.MessageDialog(self, gtk.DIALOG_DESTROY_WITH_PARENT,
-                              gtk.MESSAGE_ERROR, gtk.BUTTONS_OK,
-                              "Invalid filename "+fname)
+            dlg = gtk.MessageDialog(self, gtk.DIALOG_DESTROY_WITH_PARENT,
+                                    gtk.MESSAGE_ERROR, gtk.BUTTONS_OK,
+                                    "Invalid filename "+fname)
             dlg.run()
             return
         args = dialogs.InputBox("Arguments",
@@ -162,9 +162,9 @@ class Application(gtk.Window):
         return
     def profile_script(self, fname):
         if not fname or not os.path.exists(fname):
-            gtk.MessageDialog(self, gtk.DIALOG_DESTROY_WITH_PARENT,
-                              gtk.MESSAGE_ERROR, gtk.BUTTONS_OK,
-                              "Invalid filename "+fname)
+            dlg = gtk.MessageDialog(self, gtk.DIALOG_DESTROY_WITH_PARENT,
+                                    gtk.MESSAGE_ERROR, gtk.BUTTONS_OK,
+                                    "Invalid filename "+fname)
             dlg.run()
             return
         args = dialogs.InputBox("Arguments",
diff --git a/examples/pango/utf8-demo.py b/examples/pango/utf8-demo.py
index f50c2806..e22da2ba 100644
--- a/examples/pango/utf8-demo.py
+++ b/examples/pango/utf8-demo.py
@@ -1,5 +1,5 @@
 # order is important here (for now)
-import gobject, gtk
+import gtk
 
 # string taken from pango examples directory and converted from utf8
 # to python unicode string escapes
diff --git a/examples/pygtk-demo/demos/__init__.py b/examples/pygtk-demo/demos/__init__.py
index 44028ca4..0ca5ff54 100644
--- a/examples/pygtk-demo/demos/__init__.py
+++ b/examples/pygtk-demo/demos/__init__.py
@@ -12,6 +12,7 @@ for _mod in _file_list:
         continue
     _mod = _mod[:-3]
     try:
+        _doc = ''
         exec 'import ' + _mod + '\n' + \
         '_doc = ' + _mod + '.__doc__'
         _description = _doc.splitlines()[0]
diff --git a/examples/pygtk-demo/demos/dnd.py b/examples/pygtk-demo/demos/dnd.py
index a96f403f..ad6cf99d 100644
--- a/examples/pygtk-demo/demos/dnd.py
+++ b/examples/pygtk-demo/demos/dnd.py
@@ -7,7 +7,8 @@ fairly straight forward port of the example distributed with gtk.
 
 import gtk
 import gobject
-from dndpixmap import *
+
+from dndpixmap import drag_icon_xpm, trashcan_open_xpm, trashcan_closed_xpm
 
 TARGET_STRING = 0
 TARGET_ROOTWIN = 1
diff --git a/examples/pygtk-demo/demos/hypertext.py b/examples/pygtk-demo/demos/hypertext.py
index 1a1df2cf..2dd0fc60 100644
--- a/examples/pygtk-demo/demos/hypertext.py
+++ b/examples/pygtk-demo/demos/hypertext.py
@@ -46,11 +46,11 @@ class HypertextDemo(gtk.Window):
 
     # Links can be activated by pressing Enter.
     def key_press_event(self, text_view, event):
-        if event.keyval == gtk.gdk.Return or \
-            event.keyval == gtk.gdk.KP_Enter:
+        if (event.keyval == gtk.gdk.Return or
+            event.keyval == gtk.gdk.KP_Enter):
             buffer = text_view.get_buffer()
             iter = buffer.get_iter_at_mark(buffer.get_insert())
-            follow_if_link(text_view, iter)
+            self.follow_if_link(text_view, iter)
         return False
 
     # Links can also be activated by clicking.
diff --git a/examples/pygtk-demo/demos/images.py b/examples/pygtk-demo/demos/images.py
index d3f0a7c3..176cfa78 100644
--- a/examples/pygtk-demo/demos/images.py
+++ b/examples/pygtk-demo/demos/images.py
@@ -251,7 +251,7 @@ class ImagesDemo(gtk.Window):
                                gtk.BUTTONS_CLOSE,
                                "Failed to load image")
 
-                    dialog.connect("response", lambda d, r: dlg.destroy())
+                    dialog.connect("response", lambda d, r: d.destroy())
                     dialog.show()
 
                     self.pixbuf_loader = None
diff --git a/examples/pygtk-demo/demos/pixbufs.py b/examples/pygtk-demo/demos/pixbufs.py
index 191312c9..c29d1dd8 100644
--- a/examples/pygtk-demo/demos/pixbufs.py
+++ b/examples/pygtk-demo/demos/pixbufs.py
@@ -56,7 +56,7 @@ class PixbufsDemo(gtk.Window):
                 gtk.MESSAGE_ERROR,
                 gtk.BUTTONS_CLOSE,
                 "Failed to load an image")
-            dialog.connect("response", lambda d, r: dlg.destroy())
+            dialog.connect("response", lambda d, r: d.destroy())
             dialog.show()
 
         else:
diff --git a/examples/pygtk-demo/demos/textview.py b/examples/pygtk-demo/demos/textview.py
index b96940a7..44166616 100644
--- a/examples/pygtk-demo/demos/textview.py
+++ b/examples/pygtk-demo/demos/textview.py
@@ -6,12 +6,11 @@ by multiple GtkTextViews. This demo has two views displaying a single buffer, an
 shows off the widget's text formatting features."""
 # pygtk version: Maik Hertha <maik.hertha@berlin.de>
 
-import sys
 import os
+import sys
 
 import gobject
 import gtk
-import pango
 
 gray50_width  = 2
 gray50_height = 2
diff --git a/examples/pygtk-demo/demos/ui_manager.py b/examples/pygtk-demo/demos/ui_manager.py
index c473f08c..02eed389 100644
--- a/examples/pygtk-demo/demos/ui_manager.py
+++ b/examples/pygtk-demo/demos/ui_manager.py
@@ -6,6 +6,7 @@ from an array of actions and a description of the menu hierarchy.
 '''
 # pygtk version: Maik Hertha <maik.hertha@berlin.de>
 
+import gobject
 import gtk
 
 def activate_action(action):
diff --git a/examples/simple/dnd.py b/examples/simple/dnd.py
index cd217fb8..0217def7 100644
--- a/examples/simple/dnd.py
+++ b/examples/simple/dnd.py
@@ -1,9 +1,10 @@
 #! /usr/bin/env python
 
-import pygtk
-pygtk.require('2.0')
-import gtk, gobject
-from dndpixmap import *
+import gobject
+import gtk
+
+from dndpixmap import drag_icon_xpm, trashcan_open_xpm, trashcan_closed_xpm
+
 
 trashcan_open = None
 trashcan_closed = None
@@ -20,9 +21,10 @@ TARGET_STRING = 0
 TARGET_ROOTWIN = 1
 
 target = [
-('STRING', 0, TARGET_STRING),
-('text/plain', 0, TARGET_STRING),
-('application/x-rootwin-drop', 0, TARGET_ROOTWIN)]
+    ('STRING', 0, TARGET_STRING),
+    ('text/plain', 0, TARGET_STRING),
+    ('application/x-rootwin-drop', 0, TARGET_ROOTWIN)
+    ]
 
 def target_drag_leave(w, context, time):
     global trashcan_closed
diff --git a/examples/simple/scribble.py b/examples/simple/scribble.py
index c1684490..465effd2 100755
--- a/examples/simple/scribble.py
+++ b/examples/simple/scribble.py
@@ -2,8 +2,6 @@
 
 #this is a simple translation of the scribble example that comes with GTK+
 
-import sys
-import pygtk; pygtk.require("2.0")
 import gtk
 
 pixmap = None