summaryrefslogtreecommitdiff
path: root/ebus
diff options
context:
space:
mode:
authorYves <yvesf-git@xapek.org>2010-06-20 14:53:22 +0200
committerYves <yvesf-git@xapek.org>2010-06-20 14:53:22 +0200
commit9bf7c799973fb7158797f92880cefb3c5939611c (patch)
tree67195cb91bf325e2dc8b32c8b6c3ab8ee90e4d13 /ebus
parent2be1a10fd6135ec833b49c378057815f31a24c0d (diff)
downloadebus-alt-9bf7c799973fb7158797f92880cefb3c5939611c.tar.gz
ebus-alt-9bf7c799973fb7158797f92880cefb3c5939611c.zip
ebus_app korrigiert, sql-modell ist noch falsch
Diffstat (limited to 'ebus')
-rw-r--r--ebus/__init__.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/ebus/__init__.py b/ebus/__init__.py
index 9ac981d..ad79846 100644
--- a/ebus/__init__.py
+++ b/ebus/__init__.py
@@ -117,7 +117,10 @@ class EbusXMLMixin(object):
p=EbusXMLMixin.ebus_xml.xpath("/ebus/packets/packet[@primary=$primary and @secondary=$secondary]",
primary="#x%.2x"%self.primary_command,
secondary="#x%.2x"%self.secondary_command)
- return len(p)>0 and p[0] or None
+ if len(p)>0 and p[0] is not None:
+ return p[0]
+ else:
+ return None
def _get_source(self):
s=EbusXMLMixin.ebus_xml.xpath("/ebus/devices/device[@address=$address]",