diff options
| author | Alex Merry <dev@randomguy3.me.uk> | 2010-12-15 16:06:06 +0000 |
|---|---|---|
| committer | Alex Merry <dev@randomguy3.me.uk> | 2010-12-15 16:06:06 +0000 |
| commit | ed2f926721535558f86c1b01ba8d541dddba7d5f (patch) | |
| tree | 6ff4f4adb9e1ce9abddf76141f8c3f1f21f9c954 | |
| parent | e9127a411d337754a7c0d1eb52c70e5740bb605f (diff) | |
Make some of the specparser.py logic clearer.
Also, PEPify constant assignment
| -rw-r--r-- | tools/specparser.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tools/specparser.py b/tools/specparser.py index 471506d0..697d4aff 100644 --- a/tools/specparser.py +++ b/tools/specparser.py @@ -162,9 +162,10 @@ class Base(object): self.docstring = getOnlyChildByName(dom, XMLNS_TP, 'docstring') self.added = getOnlyChildByName(dom, XMLNS_TP, 'added') self.deprecated = getOnlyChildByName(dom, XMLNS_TP, 'deprecated') - self.is_deprecated = True if self.deprecated is None: self.is_deprecated = (getAnnotationByName(dom, 'org.freedesktop.DBus.Deprecated') == 'true') + else: + self.is_deprecated = True self.changed = getChildrenByName(dom, XMLNS_TP, 'changed') @@ -583,14 +584,14 @@ class Typed(Base): return '%s(%s:%s)' % (self.__class__.__name__, self.name, self.dbus_type) class Property(DBusConstruct, Typed): - ACCESS_READ = 1 - ACCESS_WRITE = 2 + ACCESS_READ = 1 + ACCESS_WRITE = 2 ACCESS_READWRITE = ACCESS_READ | ACCESS_WRITE - EMITS_CHANGED_UNKNOWN = 0 - EMITS_CHANGED_NONE = 1 - EMITS_CHANGED_UPDATES = 2 + EMITS_CHANGED_UNKNOWN = 0 + EMITS_CHANGED_NONE = 1 + EMITS_CHANGED_UPDATES = 2 EMITS_CHANGED_INVALIDATES = 3 def __init__(self, parent, namespace, dom): |