summaryrefslogtreecommitdiff
path: root/giscanner/annotationparser.py
diff options
context:
space:
mode:
authorRyan Lortie <desrt@desrt.ca>2014-05-06 13:38:03 -0400
committerRyan Lortie <desrt@desrt.ca>2014-05-06 13:39:08 -0400
commit3c9882840e75d60b82aa26e6494e494d994279c3 (patch)
tree172e4430a697329739602c3ef2bb9a71d155dbe0 /giscanner/annotationparser.py
parent40768637bcb49e2a91cff76bab2b8207b7981b22 (diff)
downloadgobject-introspection-3c9882840e75d60b82aa26e6494e494d994279c3.tar.gz
Revert "giscanner: don't accept (allow-none) on Returns:"
This reverts commit 0839e696e9fbc1942ac5c61054de3b47e9578152. This was accidentally picked up by my 'git bz apply' against the bug as I was getting ready to push the last set of changes.
Diffstat (limited to 'giscanner/annotationparser.py')
-rw-r--r--giscanner/annotationparser.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py
index a167ff94..ecbfdce6 100644
--- a/giscanner/annotationparser.py
+++ b/giscanner/annotationparser.py
@@ -981,7 +981,7 @@ class GtkDocTag(GtkDocAnnotatable):
__slots__ = ('name', 'value', 'description')
- valid_annotations = (ANN_ARRAY, ANN_ATTRIBUTES, ANN_ELEMENT_TYPE, ANN_SKIP,
+ valid_annotations = (ANN_ALLOW_NONE, ANN_ARRAY, ANN_ATTRIBUTES, ANN_ELEMENT_TYPE, ANN_SKIP,
ANN_TRANSFER, ANN_TYPE)
def __init__(self, name, position=None):