THRIFT-3540 Make python tutorial more in line with PEP8
This closes #786
diff --git a/tutorial/py.twisted/PythonServer.py b/tutorial/py.twisted/PythonServer.py
index c578321..1b0e2d5 100755
--- a/tutorial/py.twisted/PythonServer.py
+++ b/tutorial/py.twisted/PythonServer.py
@@ -19,12 +19,13 @@
# under the License.
#
-import sys, glob
+import glob
+import sys
sys.path.append('gen-py.twisted')
sys.path.insert(0, glob.glob('../../lib/py/build/lib*')[0])
from tutorial import Calculator
-from tutorial.ttypes import *
+from tutorial.ttypes import InvalidOperation, Operation
from shared.ttypes import SharedStruct
@@ -33,61 +34,63 @@
from thrift.transport import TTwisted
from thrift.protocol import TBinaryProtocol
-from thrift.server import TServer
+
class CalculatorHandler:
- implements(Calculator.Iface)
- def __init__(self):
- self.log = {}
+ implements(Calculator.Iface)
- def ping(self):
- print('ping()')
+ def __init__(self):
+ self.log = {}
- def add(self, n1, n2):
- print('add(%d,%d)' % (n1, n2))
- return n1+n2
+ def ping(self):
+ print('ping()')
- def calculate(self, logid, work):
- print('calculate(%d, %r)' % (logid, work))
+ def add(self, n1, n2):
+ print('add(%d,%d)' % (n1, n2))
+ return n1 + n2
- if work.op == Operation.ADD:
- val = work.num1 + work.num2
- elif work.op == Operation.SUBTRACT:
- val = work.num1 - work.num2
- elif work.op == Operation.MULTIPLY:
- val = work.num1 * work.num2
- elif work.op == Operation.DIVIDE:
- if work.num2 == 0:
- x = InvalidOperation()
- x.whatOp = work.op
- x.why = 'Cannot divide by 0'
- raise x
- val = work.num1 / work.num2
- else:
- x = InvalidOperation()
- x.whatOp = work.op
- x.why = 'Invalid operation'
- raise x
+ def calculate(self, logid, work):
+ print('calculate(%d, %r)' % (logid, work))
- log = SharedStruct()
- log.key = logid
- log.value = '%d' % (val)
- self.log[logid] = log
+ if work.op == Operation.ADD:
+ val = work.num1 + work.num2
+ elif work.op == Operation.SUBTRACT:
+ val = work.num1 - work.num2
+ elif work.op == Operation.MULTIPLY:
+ val = work.num1 * work.num2
+ elif work.op == Operation.DIVIDE:
+ if work.num2 == 0:
+ x = InvalidOperation()
+ x.whatOp = work.op
+ x.why = 'Cannot divide by 0'
+ raise x
+ val = work.num1 / work.num2
+ else:
+ x = InvalidOperation()
+ x.whatOp = work.op
+ x.why = 'Invalid operation'
+ raise x
- return val
+ log = SharedStruct()
+ log.key = logid
+ log.value = '%d' % (val)
+ self.log[logid] = log
- def getStruct(self, key):
- print('getStruct(%d)' % (key))
- return self.log[key]
+ return val
- def zip(self):
- print('zip()')
+ def getStruct(self, key):
+ print('getStruct(%d)' % (key))
+ return self.log[key]
+
+ def zip(self):
+ print('zip()')
if __name__ == '__main__':
handler = CalculatorHandler()
processor = Calculator.Processor(handler)
pfactory = TBinaryProtocol.TBinaryProtocolFactory()
- server = reactor.listenTCP(9090,
- TTwisted.ThriftServerFactory(processor,
- pfactory), interface="127.0.0.1")
+ server = reactor.listenTCP(
+ 9090,
+ TTwisted.ThriftServerFactory(processor, pfactory),
+ interface="127.0.0.1")
reactor.run()