THRIFT-3540 Make python tutorial more in line with PEP8
This closes #786
diff --git a/tutorial/py.twisted/PythonClient.py b/tutorial/py.twisted/PythonClient.py
index e80c0fc..63dde7e 100755
--- a/tutorial/py.twisted/PythonClient.py
+++ b/tutorial/py.twisted/PythonClient.py
@@ -19,51 +19,53 @@
# 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, Work
from twisted.internet.defer import inlineCallbacks
from twisted.internet import reactor
from twisted.internet.protocol import ClientCreator
-from thrift import Thrift
from thrift.transport import TTwisted
from thrift.protocol import TBinaryProtocol
+
@inlineCallbacks
def main(client):
- yield client.ping()
- print('ping()')
+ yield client.ping()
+ print('ping()')
- sum = yield client.add(1,1)
- print(('1+1=%d' % (sum)))
+ sum = yield client.add(1, 1)
+ print(('1+1=%d' % (sum)))
- work = Work()
+ work = Work()
- work.op = Operation.DIVIDE
- work.num1 = 1
- work.num2 = 0
+ work.op = Operation.DIVIDE
+ work.num1 = 1
+ work.num2 = 0
- try:
- quotient = yield client.calculate(1, work)
- print('Whoa? You know how to divide by zero?')
- except InvalidOperation as e:
- print(('InvalidOperation: %r' % e))
+ try:
+ quotient = yield client.calculate(1, work)
+ print('Whoa? You know how to divide by zero?')
+ print('FYI the answer is %d' % quotient)
+ except InvalidOperation as e:
+ print(('InvalidOperation: %r' % e))
- work.op = Operation.SUBTRACT
- work.num1 = 15
- work.num2 = 10
+ work.op = Operation.SUBTRACT
+ work.num1 = 15
+ work.num2 = 10
- diff = yield client.calculate(1, work)
- print(('15-10=%d' % (diff)))
+ diff = yield client.calculate(1, work)
+ print(('15-10=%d' % (diff)))
- log = yield client.getStruct(1)
- print(('Check log: %s' % (log.value)))
- reactor.stop()
+ log = yield client.getStruct(1)
+ print(('Check log: %s' % (log.value)))
+ reactor.stop()
if __name__ == '__main__':
d = ClientCreator(reactor,