From 00b0ae6bca603adc2c424c9a9384c60c4e4b1ccb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Sat, 3 Jan 2009 13:43:07 +0000 Subject: Fix inconsistencies with PEP8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2009-01-03 Jürg Billeter * giscanner/ast.py: * giscanner/dumper.py: * giscanner/girparser.py: * giscanner/glibtransformer.py: * giscanner/sourcescanner.py: * giscanner/transformer.py: * giscanner/xmlwriter.py: Fix inconsistencies with PEP8 svn path=/trunk/; revision=997 --- ChangeLog | 12 ++++++++++++ giscanner/ast.py | 1 - giscanner/dumper.py | 2 -- giscanner/girparser.py | 2 -- giscanner/glibtransformer.py | 7 ------- giscanner/sourcescanner.py | 2 -- giscanner/transformer.py | 2 -- giscanner/xmlwriter.py | 2 -- 8 files changed, 12 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 13e658d5..8bf8a3bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2009-01-03 Jürg Billeter + + * giscanner/ast.py: + * giscanner/dumper.py: + * giscanner/girparser.py: + * giscanner/glibtransformer.py: + * giscanner/sourcescanner.py: + * giscanner/transformer.py: + * giscanner/xmlwriter.py: + + Fix inconsistencies with PEP8 + 2008-12-21 Johan Dahlin * gir/gio-2.0.c: diff --git a/giscanner/ast.py b/giscanner/ast.py index 92ec47d8..7df1bf69 100644 --- a/giscanner/ast.py +++ b/giscanner/ast.py @@ -428,7 +428,6 @@ class Property(Node): # FIXME: Inherit from Function - class Callback(Node): def __init__(self, name, retval, parameters, ctype=None): diff --git a/giscanner/dumper.py b/giscanner/dumper.py index 45dcc25f..c85ae807 100644 --- a/giscanner/dumper.py +++ b/giscanner/dumper.py @@ -88,7 +88,6 @@ class DumpCompiler(object): self._packages.append('gobject-introspection-1.0') # Public API - def run(self): c_path = self._generate_tempfile('.c') f = open(c_path, 'w') @@ -113,7 +112,6 @@ class DumpCompiler(object): return IntrospectionBinary([bin_path], self._tmpdir) # Private API - def _generate_tempfile(self, suffix=''): tmpl = '%s-%s%s' % (self._options.namespace_name, self._options.namespace_version, suffix) diff --git a/giscanner/girparser.py b/giscanner/girparser.py index cb391e74..17f53521 100644 --- a/giscanner/girparser.py +++ b/giscanner/girparser.py @@ -53,7 +53,6 @@ class GIRParser(object): self._namespace = None # Public API - def parse(self, filename): tree = parse(filename) self.parse_tree(tree) @@ -80,7 +79,6 @@ class GIRParser(object): self._include_parsing = include_parsing # Private - def _add_node(self, node): self._namespace.nodes.append(node) diff --git a/giscanner/glibtransformer.py b/giscanner/glibtransformer.py index b6526ea0..5ad8e303 100644 --- a/giscanner/glibtransformer.py +++ b/giscanner/glibtransformer.py @@ -99,7 +99,6 @@ class GLibTransformer(object): self._validating = False # Public API - def set_introspection_binary(self, binary): self._binary = binary @@ -166,7 +165,6 @@ class GLibTransformer(object): return namespace # Private - def _add_attribute(self, node, replace=False): node_name = node.name if (not replace) and node_name in self._names.names: @@ -205,7 +203,6 @@ class GLibTransformer(object): self._uscore_type_names[no_uscore_prefixed] = node # Helper functions - def _resolve_gtypename(self, gtype_name): try: return self._transformer.gtypename_to_giname(gtype_name, @@ -256,7 +253,6 @@ class GLibTransformer(object): self._register_internal_type(type_name, node) # Parser - def _parse_node(self, node): if isinstance(node, Enum): self._parse_enum(node) @@ -516,7 +512,6 @@ class GLibTransformer(object): del self._names.names[maybe_class.name] # Introspection - def _introspect_type(self, xmlnode): if xmlnode.tag in ('enum', 'flags'): self._introspect_enum(xmlnode) @@ -647,7 +642,6 @@ class GLibTransformer(object): node.signals.append(signal) # Resolver - def _resolve_type_name(self, type_name, ctype=None): # Workaround glib bug #548689, to be included in 2.18.0 if type_name == "GParam": @@ -843,7 +837,6 @@ class GLibTransformer(object): alias.target = self._resolve_type_name(alias.target, alias.target) # Validation - def _validate(self, nodes): nodes = list(self._names.names.itervalues()) i = 0 diff --git a/giscanner/sourcescanner.py b/giscanner/sourcescanner.py index 0d7ed7c9..3188b262 100644 --- a/giscanner/sourcescanner.py +++ b/giscanner/sourcescanner.py @@ -192,7 +192,6 @@ class SourceScanner(object): self._cpp_options = [] # Public API - def set_cpp_options(self, includes, defines, undefines): for prefix, args in [('-I', includes), ('-D', defines), @@ -233,7 +232,6 @@ class SourceScanner(object): print symbol.ident, symbol.base_type.name, symbol.type # Private - def _parse(self, filenames): if not filenames: return diff --git a/giscanner/transformer.py b/giscanner/transformer.py index bba44f7d..e7c7214a 100644 --- a/giscanner/transformer.py +++ b/giscanner/transformer.py @@ -109,7 +109,6 @@ class Transformer(object): self._includes.add(include) # Private - def _find_include(self, include): searchdirs = self._includepaths[:] for path in _xdg_data_dirs: @@ -273,7 +272,6 @@ class Transformer(object): # We take the annotations from the parser as strings; here we # want to split them into components, so: # (transfer full) -> {'transfer' : [ 'full' ]} - def _parse_options(self, options): ret = {} ws_re = re.compile(r'\s+') diff --git a/giscanner/xmlwriter.py b/giscanner/xmlwriter.py index bed3f991..6fd03f44 100644 --- a/giscanner/xmlwriter.py +++ b/giscanner/xmlwriter.py @@ -82,7 +82,6 @@ class XMLWriter(object): self._indent_char = ' ' # Private - def _open_tag(self, tag_name, attributes=None): attrs = collect_attributes( tag_name, attributes, self._indent, @@ -94,7 +93,6 @@ class XMLWriter(object): self.write_line('' % (tag_name, )) # Public API - def get_xml(self): return self._data.getvalue() -- cgit v1.2.1