diff options
| author | Robert McQueen <robot101@debian.org> | 2005-11-07 15:31:30 +0000 |
|---|---|---|
| committer | Robert McQueen <robot101@debian.org> | 2005-11-07 15:31:30 +0000 |
| commit | e598c5edc5b4d3fa7eb474ab3cd93ec6747e4bc0 (patch) | |
| tree | b6769252aea4e581aef2261fcdd1ceebd321b8fc /python/introspect_parser.py | |
| parent | 95f9771d6be677d3393aab60f0f56126fbb252a6 (diff) | |
2005-11-07 Robert McQueen <robot101@debian.org>
* python/decorators.py: Change emit_signal function to use the
signature annotation of the signal when marhsalling the arguments from
the service. Fix a bug where the code checking signature length
against argument length referenced the wrong variable.
* python/introspect_parser.py: Avoid adding the type signature of
signal arguments to any methods which occur after them in the
introspection data (!) by making the parser a little more careful
about its current state.
* python/service.py: Remove debug prints from last commit (again :D).
* test/python/test-client.py, test/python/test-service.py: Add test
signals with signature decorators to test the strict marshalling code
gives errors at the right time. Could do with checking the signals
actually get emitted too, given that the test does nothing with
signals at the moment...
Diffstat (limited to 'python/introspect_parser.py')
| -rw-r--r-- | python/introspect_parser.py | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/python/introspect_parser.py b/python/introspect_parser.py index 40cae1e7..47c9806e 100644 --- a/python/introspect_parser.py +++ b/python/introspect_parser.py @@ -13,35 +13,36 @@ def process_introspection_data(data): reader = input_source.newTextReader("urn:introspect") ret = reader.Read() - current_iface='' - current_method='' + current_iface = None + current_method = None current_sigstr = '' - + while ret == 1: name = reader.LocalName() if reader.NodeType() == XMLREADER_START_ELEMENT_NODE_TYPE: - if name == 'interface': + if (not current_iface and not current_method and name == 'interface'): current_iface = reader.GetAttribute('name') - elif name == 'method': + elif (current_iface and not current_method and name == 'method'): current_method = reader.GetAttribute('name') if reader.IsEmptyElement(): - method_map[current_iface + '.' + current_method] = '' - current_method = '' + method_map[current_iface + '.' + current_method] = '' + current_method = None current_sigstr = '' - - elif name == 'arg': + + elif (current_iface and current_method and name == 'arg'): direction = reader.GetAttribute('direction') if not direction or direction == 'in': current_sigstr = current_sigstr + reader.GetAttribute('type') elif reader.NodeType() == XMLREADER_END_ELEMENT_NODE_TYPE: - if name == 'method': - method_map[current_iface + '.' + current_method] = current_sigstr - current_method = '' + if (current_iface and not current_method and name == 'interface'): + current_iface = None + if (current_iface and current_method and name == 'method'): + method_map[current_iface + '.' + current_method] = current_sigstr + current_method = None current_sigstr = '' - ret = reader.Read() if ret != 0: |