Fix up previous deprecated commit for review comments

svn path=/trunk/; revision=605

diff --git a/giscanner/ast.py b/giscanner/ast.py
index b80559b..7cd9073 100644 (file)
--- a/giscanner/ast.py
+++ b/giscanner/ast.py
@@ -118,6 +118,7 @@ class Node(object):
     def __init__(self, name=None):
         self.name = name
         self.deprecated = None
+        self.deprecated_version = None
 
     def __repr__(self):
         return '%s(%r)' % (self.__class__.__name__, self.name)

diff --git a/giscanner/girwriter.py b/giscanner/girwriter.py
index efa0f01..27d4dd6 100644 (file)
--- a/giscanner/girwriter.py
+++ b/giscanner/girwriter.py
@@ -83,11 +83,10 @@ class GIRWriter(XMLWriter):
 
     def _append_deprecated(self, node, attrs):
         if node.deprecated:
-            (deprecated_version, deprecated_str) = node.deprecated
-            attrs.append(('deprecated', deprecated_str.strip()))
-            if deprecated_version:
+            attrs.append(('deprecated', node.deprecated))
+            if node.deprecated_version:
                 attrs.append(('deprecated-version',
-                              deprecated_version.strip()))
+                              node.deprecated_version))
 
     def _write_alias(self, alias):
         attrs = [('name', alias.name), ('target', alias.target)]

diff --git a/giscanner/transformer.py b/giscanner/transformer.py
index 2f96b50..b04efd3 100644 (file)
--- a/giscanner/transformer.py
+++ b/giscanner/transformer.py
@@ -225,12 +225,14 @@ class Transformer(object):
         func = Function(name, return_, parameters, symbol.ident)
         deprecated = directives.get('deprecated', False)
         if deprecated:
-            try:
+            deprecated_value = deprecated[0]
+            if ':' in deprecated_value:
                 # Split out gtk-doc version
-                func.deprecated = deprecated[0].split(':', 1)
-            except ValueError, e:
+                (func.deprecated_version, func.deprecated) = \
+                    [x.strip() for x in deprecated_value.split(':', 1)]
+            else:
                 # No version, just include str
-                func.deprecated = (None, deprecated[0])
+                func.deprecated = deprecated_value.strip()
         return func
 
     def _create_source_type(self, source_type):