# HG changeset patch
# User Drew Perttula <drewp@bigasterisk.com>
# Date 1402649539 0
# Node ID 04d5f94be12b9fa4bc4b77a99ab8bbd8e642cabc
# Parent  38802eaca8fc8872992ab869dcb0e02a294747ee
use the correct TimeoutError
Ignore-this: ecaf2fe7de000cfca31c8c8bf34da9c1

diff -r 38802eaca8fc -r 04d5f94be12b light9/effecteval/effectloop.py
--- 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