pyflakes

9 files changed, 26 insertions, 20 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):