diff options
30 files changed, 63 insertions, 60 deletions
diff --git a/codegen/argtypes.py b/codegen/argtypes.py index 3255c439..5207ccbd 100644 --- a/codegen/argtypes.py +++ b/codegen/argtypes.py @@ -1,7 +1,5 @@ # -*- Mode: Python; py-indent-offset: 4 -*- -import sys import string -import traceback import keyword import struct diff --git a/codegen/codegen.py b/codegen/codegen.py index c4d1739e..f1078a80 100644 --- a/codegen/codegen.py +++ b/codegen/codegen.py @@ -1,7 +1,13 @@ -import sys, os, string -import getopt, traceback, keyword -import defsparser, argtypes, override +import getopt +import keyword +import os +import string +import sys + +import argtypes import definitions +import defsparser +import override import reversewrapper class Coverage(object): diff --git a/codegen/definitions.py b/codegen/definitions.py index 8a33163b..7136b72c 100644 --- a/codegen/definitions.py +++ b/codegen/definitions.py @@ -1,6 +1,6 @@ # -*- Mode: Python; py-indent-offset: 4 -*- +import copy import sys -from copy import * def get_valid_scheme_definitions(defs): return [x for x in defs if isinstance(x, tuple) and len(x) >= 2] @@ -334,7 +334,7 @@ class MethodDefBase(Definition): self.varargs = old.varargs # here we merge extra parameter flags accross to the new object. if not parmerge: - self.params = deepcopy(old.params) + self.params = copy.deepcopy(old.params) return for i in range(len(self.params)): ptype, pname, pdflt, pnull = self.params[i] @@ -463,7 +463,7 @@ class FunctionDef(Definition): self.caller_owns_return = old.caller_owns_return self.varargs = old.varargs if not parmerge: - self.params = deepcopy(old.params) + self.params = copy.deepcopy(old.params) return # here we merge extra parameter flags accross to the new object. def merge_param(param): @@ -473,7 +473,7 @@ class FunctionDef(Definition): # h2def never scans Property's, therefore if # we have one it was manually written, so we # keep it. - return deepcopy(old_param) + return copy.deepcopy(old_param) else: param.merge(old_param) return param @@ -484,7 +484,7 @@ class FunctionDef(Definition): except RuntimeError: # parameter names changed and we can't find a match; it's # safer to keep the old parameter list untouched. - self.params = deepcopy(old.params) + self.params = copy.deepcopy(old.params) if not self.is_constructor_of: try: diff --git a/codegen/defsparser.py b/codegen/defsparser.py index 2489c7a7..44288f7e 100644 --- a/codegen/defsparser.py +++ b/codegen/defsparser.py @@ -1,7 +1,8 @@ # -*- Mode: Python; py-indent-offset: 4 -*- import os, sys import scmexpr -from definitions import * +from definitions import BoxedDef, EnumDef, FlagsDef, FunctionDef, \ + InterfaceDef, MethodDef, ObjectDef, PointerDef, VirtualDef class IncludeParser(scmexpr.Parser): """A simple parser that follows include statements automatically""" diff --git a/codegen/docextract.py b/codegen/docextract.py index e398d783..e6c65053 100644 --- a/codegen/docextract.py +++ b/codegen/docextract.py @@ -83,10 +83,10 @@ def parse_file(fp, doc_dict): if match: # assume the last return statement was really part of the # description - cur_doc.description = cur_doc.description + return_start + \ - cur_doc.ret return_start = match.group(1) cur_doc.ret = match.group(2) + cur_doc.description = cur_doc.description + return_start + \ + cur_doc.ret else: cur_doc.append_return(line) elif in_description: diff --git a/codegen/docextract_to_xml.py b/codegen/docextract_to_xml.py index 219f2d72..76ac85d7 100755 --- a/codegen/docextract_to_xml.py +++ b/codegen/docextract_to_xml.py @@ -6,10 +6,11 @@ # Usage example: # # ./docextract_to_xml.py -s /gnome/head/cvs/gtk+/gtk/ -s /gnome/head/cvs/gtk+/docs/reference/gtk/tmpl/ > gtk_docs.xml -import sys, os, string, re, getopt +import getopt +import string +import sys import docextract -import string def escape_text(unescaped_text): escaped_text = unescaped_text diff --git a/codegen/mergedefs.py b/codegen/mergedefs.py index 3e92f9c0..773e499b 100755 --- a/codegen/mergedefs.py +++ b/codegen/mergedefs.py @@ -1,11 +1,12 @@ #!/usr/bin/env python # -*- Mode: Python; py-indent-offset: 4 -*- -import sys +import optparse + import defsparser -from optparse import OptionParser -parser = OptionParser(usage="usage: %prog [options] generated-defs old-defs") +parser = optparse.OptionParser( + usage="usage: %prog [options] generated-defs old-defs") parser.add_option("-p", "--merge-parameters", help="Merge changes in function/methods parameter lists", action="store_true", dest="parmerge", default=False) diff --git a/codegen/reversewrapper.py b/codegen/reversewrapper.py index 412ac67f..2ecab8ed 100644 --- a/codegen/reversewrapper.py +++ b/codegen/reversewrapper.py @@ -756,7 +756,7 @@ def _test(): wrapper.add_parameter(PyGObjectMethodParam(wrapper, "self", method_name="do_xxx")) wrapper.add_parameter(StringParam(wrapper, "param2", optional=True)) wrapper.add_parameter(GObjectParam(wrapper, "param3")) - wrapper.add_parameter(InoutIntParam(wrapper, "param4")) + #wrapper.add_parameter(InoutIntParam(wrapper, "param4")) wrapper.generate(FileCodeSink(sys.stderr)) if 0: diff --git a/codegen/scmexpr.py b/codegen/scmexpr.py index d08c517a..02f2e4bf 100644 --- a/codegen/scmexpr.py +++ b/codegen/scmexpr.py @@ -3,7 +3,6 @@ from __future__ import generators import string -import types from cStringIO import StringIO class error(Exception): 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 diff --git a/gtk/__init__.py b/gtk/__init__.py index d7f00205..6ce8cd82 100644 --- a/gtk/__init__.py +++ b/gtk/__init__.py @@ -27,6 +27,7 @@ from warnings import warn as _warn # this can go when things are a little further along try: import ltihooks + ltihooks # pyflakes sys.path.insert(1, 'gobject') del ltihooks except ImportError: @@ -16,7 +16,6 @@ official homepage, http://www.daa.com.au/~james/pygtk/""" from distutils.command.build import build from distutils.core import setup -import glob import os import sys @@ -246,6 +245,7 @@ if gtk.can_build(): else: try: import Numeric + Numeric # pyflakes GLOBAL_MACROS.append(('HAVE_NUMPY', 1)) except ImportError: print ('* Numeric module could not be found, ' @@ -270,6 +270,7 @@ else: sys.argv.remove('--enable-threading') try: import thread + thread # pyflakes except ImportError: print "Warning: Could not import thread module, disabling threading" enable_threading = False diff --git a/tests/test_actiongroup.py b/tests/test_actiongroup.py index 02aa4231..a4fb97d8 100644 --- a/tests/test_actiongroup.py +++ b/tests/test_actiongroup.py @@ -1,8 +1,7 @@ # Test for Bug #162874 -import unittest -import sys import gc +import unittest from common import gtk, gobject diff --git a/tests/test_conversion.py b/tests/test_conversion.py index d3aee722..30d29df8 100644 --- a/tests/test_conversion.py +++ b/tests/test_conversion.py @@ -1,7 +1,5 @@ # -*- Mode: Python -*- -import sys - import unittest from common import gtk, gobject diff --git a/tests/test_enum.py b/tests/test_enum.py index 88d82872..39aa97e1 100644 --- a/tests/test_enum.py +++ b/tests/test_enum.py @@ -2,7 +2,7 @@ import unittest import warnings from gobject import GEnum, GFlags, GObject, GType, PARAM_READWRITE -from common import gobject, atk, pango, gtk, gdk +from common import gobject, atk, gtk, gdk class PObject(GObject): __gproperties__ = { diff --git a/tests/test_style.py b/tests/test_style.py index a356a5ae..e55f1028 100644 --- a/tests/test_style.py +++ b/tests/test_style.py @@ -1,5 +1,4 @@ import unittest -import gc from common import gtk diff --git a/tests/test_textview.py b/tests/test_textview.py index 5022fdac..7df602ad 100644 --- a/tests/test_textview.py +++ b/tests/test_textview.py @@ -1,4 +1,3 @@ -import sys import unittest from common import gtk diff --git a/tests/testmodule.py b/tests/testmodule.py index c6263341..3cff2f28 100644 --- a/tests/testmodule.py +++ b/tests/testmodule.py @@ -1,4 +1,3 @@ -import gobject import gtk class PyLabel(gtk.Label): |