From 9aa8bfdf7b0d38af356348204518ce13bf6e761a Mon Sep 17 00:00:00 2001 From: BlauFeuer Date: Tue, 7 Mar 2017 07:36:53 -0500 Subject: [PATCH] Fix Typos, whitespace, docstring, long lines --- evennia/server/amp.py | 48 +++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/evennia/server/amp.py b/evennia/server/amp.py index 621600e158..4b4435b318 100644 --- a/evennia/server/amp.py +++ b/evennia/server/amp.py @@ -7,7 +7,7 @@ The separation works like this: Portal - (AMP client) handles protocols. It contains a list of connected sessions in a dictionary for identifying the respective player - connected. If it looses the AMP connection it will automatically + connected. If it loses the AMP connection it will automatically try to reconnect. Server - (AMP server) Handles all mud operations. The server holds its own list @@ -32,33 +32,33 @@ from twisted.internet import protocol from twisted.internet.defer import Deferred from evennia.utils import logger from evennia.utils.utils import to_str, variable_from_module +import zlib # Used in Compressed class DUMMYSESSION = namedtuple('DummySession', ['sessid'])(0) # communication bits # (chr(9) and chr(10) are \t and \n, so skipping them) -PCONN = chr(1) # portal session connect -PDISCONN = chr(2) # portal session disconnect -PSYNC = chr(3) # portal session sync -SLOGIN = chr(4) # server session login -SDISCONN = chr(5) # server session disconnect -SDISCONNALL = chr(6) # server session disconnect all -SSHUTD = chr(7) # server shutdown -SSYNC = chr(8) # server session sync +PCONN = chr(1) # portal session connect +PDISCONN = chr(2) # portal session disconnect +PSYNC = chr(3) # portal session sync +SLOGIN = chr(4) # server session login +SDISCONN = chr(5) # server session disconnect +SDISCONNALL = chr(6) # server session disconnect all +SSHUTD = chr(7) # server shutdown +SSYNC = chr(8) # server session sync SCONN = chr(11) # server creating new connection (for irc bots and etc) -PCONNSYNC = chr(12) # portal post-syncing a session -PDISCONNALL = chr(13) # portal session disconnect all +PCONNSYNC = chr(12) # portal post-syncing a session +PDISCONNALL = chr(13) # portal session disconnect all AMP_MAXLEN = amp.MAX_VALUE_LENGTH # max allowed data length in AMP protocol (cannot be changed) -BATCH_RATE = 250 # max commands/sec before switching to batch-sending -BATCH_TIMEOUT = 0.5 # how often to poll to empty batch queue, in seconds +BATCH_RATE = 250 # max commands/sec before switching to batch-sending +BATCH_TIMEOUT = 0.5 # how often to poll to empty batch queue, in seconds # buffers _SENDBATCH = defaultdict(list) _MSGBUFFER = defaultdict(list) -import zlib def get_restart_mode(restart_file): """ @@ -323,9 +323,9 @@ dumps = lambda data: to_str(pickle.dumps(to_str(data), pickle.HIGHEST_PROTOCOL)) loads = lambda data: pickle.loads(to_str(data)) -#------------------------------------------------------------ +# ------------------------------------------------------------- # Core AMP protocol for communication Server <-> Portal -#------------------------------------------------------------ +# ------------------------------------------------------------- class AMPProtocol(amp.AMP): """ @@ -385,7 +385,6 @@ class AMPProtocol(amp.AMP): """ pass - # Error handling def errback(self, e, info): @@ -447,7 +446,7 @@ class AMPProtocol(amp.AMP): Access method called by the Portal and executed on the Portal. Args: - sessid (int): Unique Session id. + session (session): Session kwargs (any, optional): Optional data. Returns: @@ -473,7 +472,6 @@ class AMPProtocol(amp.AMP): self.factory.portal.sessions.data_out(session, **kwargs) return {} - def send_MsgServer2Portal(self, session, **kwargs): """ Access method - executed on the Server for sending data @@ -506,7 +504,7 @@ class AMPProtocol(amp.AMP): # create a new session and sync it server_sessionhandler.portal_connect(kwargs.get("sessiondata")) - elif operation == PCONNSYNC: #portal_session_sync + elif operation == PCONNSYNC: # portal_session_sync server_sessionhandler.portal_session_sync(kwargs.get("sessiondata")) elif operation == PDISCONN: # portal_session_disconnect @@ -515,7 +513,7 @@ class AMPProtocol(amp.AMP): if session: server_sessionhandler.portal_disconnect(session) - elif operation == PDISCONNALL: # portal_disconnect_all + elif operation == PDISCONNALL: # portal_disconnect_all # portal orders all sessions to close server_sessionhandler.portal_disconnect_all() @@ -545,7 +543,7 @@ class AMPProtocol(amp.AMP): """ return self.send_data(AdminPortal2Server, session.sessid, operation=operation, **kwargs) - # Portal administraton from the Server side + # Portal administration from the Server side @AdminServer2Portal.responder def portal_receive_adminserver2portal(self, packed_data): @@ -562,7 +560,6 @@ class AMPProtocol(amp.AMP): operation = kwargs.pop("operation") portal_sessionhandler = self.factory.portal.sessions - if operation == SLOGIN: # server_session_login # a session has authenticated; sync it. session = portal_sessionhandler.get(sessid) @@ -591,7 +588,7 @@ class AMPProtocol(amp.AMP): # set a flag in case we are about to shut down soon self.factory.server_restart_mode = True - elif operation == SCONN: # server_force_connection (for irc/etc) + elif operation == SCONN: # server_force_connection (for irc/etc) portal_sessionhandler.server_connect(**kwargs) else: @@ -665,4 +662,5 @@ class AMPProtocol(amp.AMP): module=modulepath, function=functionname, args=dumps(args), - kwargs=dumps(kwargs)).addCallback(lambda r: loads(r["result"])).addErrback(self.errback, "FunctionCall") + kwargs=dumps(kwargs)).addCallback( + lambda r: loads(r["result"])).addErrback(self.errback, "FunctionCall")