Changeset 49

Timestamp:

09/25/07 05:41:12 (1 year ago)

Author:

devja..@anarkystic.com

Message:

handle errors more

Files:

• photobooth/photobooth.py (modified) (5 diffs)

photobooth/photobooth.py

@@ -79 +79 @@
-            d.addCallback(lambda x: self.startCountdown())
-        self.bucket.append(evt.data)
+        d.addErrback(lambda _: None)
-        return d
-
@@ -100 +101 @@
-        people = [self.people[tag] for tag in self.bucket if tag in self.people]
-        return defer.succeed(people)
-        d = self._tagsToPeople()
-        
-        def _addContacts(rv):
-            for p in rv:
-                p['contacts'] = [{"id": "test", "name": p['name'] + "TEST"},
-                                 {"id": "test2", "name": p['name'] + "TEST2"}
-                                    ]
-            return rv
-        #d.addCallback(_addContacts)
-        def _printError(e):
-            import traceback
-            traceback.print_exc()
-            return []
-        d.addErrback(_printError)
-        return d
-
-    def _tagToPerson(self, tag):
@@ -125 +111 @@
-                dict(uri='urn:rfid:%s'%(tag)))
-        def _getId(rv):
+            if not rv:
+                raise NotFoundException("no user found for tag %s"%(tag))
-            return rv[0]['thg_id']
-
@@ -132 +120 @@
-    
-    def _getPersonByThing(self, thing):
+        if not thing:
+            return None
-        d = self.remote.call("picnic.persons.get",
-                dict(id=thing))
@@ -141 +131 @@
-
-    def _fillContacts(self, person):
+        if not person:
+            return None
-        d = self.remote.call("picnic.relations.getList",
-                dict(id=person['id']))