changeset 1130:04d5f94be12b

use the correct TimeoutError Ignore-this: ecaf2fe7de000cfca31c8c8bf34da9c1
author Drew Perttula <drewp@bigasterisk.com>
date Fri, 13 Jun 2014 08:52:19 +0000
parents 38802eaca8fc
children 32cae9be6c15
files light9/effecteval/effectloop.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/light9/effecteval/effectloop.py	Fri Jun 13 08:16:03 2014 +0000
+++ b/light9/effecteval/effectloop.py	Fri Jun 13 08:52:19 2014 +0000
@@ -3,7 +3,8 @@
 import numpy
 import serial
 from twisted.internet import reactor, threads
-from twisted.internet.defer import inlineCallbacks, returnValue, succeed, TimeoutError
+from twisted.internet.defer import inlineCallbacks, returnValue, succeed
+from twisted.internet.error import TimeoutError
 from rdflib import URIRef, Literal
 import cyclone.httpclient
 from light9.namespaces import L9, RDF, RDFS