Simplify callback chain on RPCs

Author: evilaliv3

scripts/travis.sh

@@ -9,6 +9,6 @@ sudo apt-get install -y debhelper devscripts dh-apparmor dh-python python python
 pip install coverage coveralls
 
 coverage run setup.py test # tests still to be implemented
-coveralls
+coveralls || true
 
 ./scripts/build.sh -d trusty -t $TRAVIS_COMMIT -n

tor2web/t2w.py

@@ -169,20 +169,18 @@ def remote_shutdown(self):
         reactor.stop()
 
 
-@defer.inlineCallbacks
 def rpc(f, *args, **kwargs):
     d = rpc_factory.getRootObject()
     d.addCallback(lambda obj: obj.callRemote(f, *args, **kwargs))
-    ret = yield d
-    defer.returnValue(ret)
+    return d
 
 
 def rpc_log(msg):
-    rpc("log_debug", str(msg))
+    return rpc("log_debug", str(msg))
 
 
 def rpc_shutdown():
-    rpc("shutdown")
+    return rpc("shutdown")
 
 
 class T2WPP(protocol.ProcessProtocol):