Fix flake8

KevinMyDing · Apr 15, 2015 · ed66f77 · ed66f77
1 parent 586a150
commit ed66f77
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/examples/multiplexer/multiplexed_client.py b/examples/multiplexer/multiplexed_client.py
@@ -10,17 +10,21 @@
 dd_thrift = thriftpy.load("dingdong.thrift", module_name="dd_thrift")
 pp_thrift = thriftpy.load("pingpong.thrift", module_name="pp_thrift")
 
+DD_SERVICE_NAME = "dd_thrift"
+PP_SERVICE_NAME = "pp_thrift"
+
+
 
 def main():
     binary_factory = TBinaryProtocolFactory()
-    dd_factory = TMultiplexingProtocolFactory(binary_factory, "dd_thrift")
+    dd_factory = TMultiplexingProtocolFactory(binary_factory, DD_SERVICE_NAME)
     with client_context(dd_thrift.DingService, '127.0.0.1', 9090,
                         proto_factory=dd_factory) as c:
         # ring that doorbell
         dong = c.ding()
         print(dong)
 
-    pp_factory = TMultiplexingProtocolFactory(binary_factory, "pp_thrift")
+    pp_factory = TMultiplexingProtocolFactory(binary_factory, PP_SERVICE_NAME)
     with client_context(pp_thrift.PingService, '127.0.0.1', 9090,
                         proto_factory=pp_factory) as c:
         # play table tennis like a champ

diff --git a/examples/multiplexer/multiplexed_server.py b/examples/multiplexer/multiplexed_server.py
@@ -10,6 +10,8 @@
 dd_thrift = thriftpy.load("dingdong.thrift", module_name="dd_thrift")
 pp_thrift = thriftpy.load("pingpong.thrift", module_name="pp_thrift")
 
+DD_SERVICE_NAME = "dd_thrift"
+PP_SERVICE_NAME = "pp_thrift"
 
 class DingDispatcher(object):
     def ding(self):
@@ -28,8 +30,8 @@ def main():
     pp_proc = TProcessor(pp_thrift.PingService, PingDispatcher())
 
     mux_proc = TMultiplexingProcessor()
-    mux_proc.register_processor("dd_thrift", dd_proc)
-    mux_proc.register_processor("pp_thrift", pp_proc)
+    mux_proc.register_processor(DD_SERVICE_NAME, dd_proc)
+    mux_proc.register_processor(PP_SERVICE_NAME, pp_proc)
 
     server = TThreadedServer(mux_proc, TServerSocket(),
                              iprot_factory=TBinaryProtocolFactory(),

diff --git a/tests/test_multiplexed.py b/tests/test_multiplexed.py
@@ -9,8 +9,10 @@
 import pytest
 
 import thriftpy
-from thriftpy.protocol import TBinaryProtocolFactory
-from thrift.protocol import TMultiplexingProtocolFactory
+from thriftpy.protocol import (
+    TBinaryProtocolFactory,
+    TMultiplexingProtocolFactory
+    )
 from thriftpy.rpc import client_context
 from thriftpy.server import TThreadedServer
 from thriftpy.thrift import TProcessor, TMultiplexingProcessor

diff --git a/thriftpy/protocol/multiplex.py b/thriftpy/protocol/multiplex.py
@@ -21,7 +21,7 @@ def __getattr__(self, name):
 
     def write_message_begin(self, name, ttype, seqid):
         self.proto.write_message_begin(
-            self.service_name + TMultiplexingProcessor.Separator + name,
+            self.service_name + TMultiplexingProcessor.SEPARATOR + name,
             ttype, seqid)
 
 

diff --git a/thriftpy/thrift.py b/thriftpy/thrift.py
@@ -247,7 +247,7 @@ def process(self, iprot, oprot):
 
 
 class TMultiplexingProcessor(TProcessor):
-    Separator = ":"
+    SEPARATOR = ":"
 
     processors = {}
     service_map = {}
@@ -268,7 +268,7 @@ def register_processor(self, service_name, processor):
     def process_in(self, iprot):
         api, type, seqid = iprot.read_message_begin()
 
-        service_name, api = api.split(TMultiplexingProcessor.Separator)
+        service_name, api = api.split(TMultiplexingProcessor.SEPARATOR)
 
         if service_name not in self.processors:
             iprot.skip(TType.STRUCT)