Mercurial > vim
changeset 7874:2313f1a94153 v7.4.1234
commit https://github.com/vim/vim/commit/488a130ea261f02317adc2c2ca93cc6e68cf2c23
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Feb 1 22:01:10 2016 +0100
patch 7.4.1234
Problem: Demo server only runs with Python 2.
Solution: Make it run with Python 3 as well. (Ken Takata)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Mon, 01 Feb 2016 22:15:04 +0100 |
| parents | e105d9205fa9 |
| children | 12cae879b674 |
| files | runtime/tools/demoserver.py src/version.c |
| diffstat | 2 files changed, 36 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/tools/demoserver.py +++ b/runtime/tools/demoserver.py @@ -11,49 +11,59 @@ # # See ":help channel-demo" in Vim. -import SocketServer +from __future__ import print_function import json import socket import sys import threading +try: + # Python 3 + import socketserver +except ImportError: + # Python 2 + import SocketServer as socketserver + thesocket = None -class ThreadedTCPRequestHandler(SocketServer.BaseRequestHandler): +class ThreadedTCPRequestHandler(socketserver.BaseRequestHandler): def handle(self): - print "=== socket opened ===" + print("=== socket opened ===") global thesocket thesocket = self.request while True: try: - data = self.request.recv(4096) + data = self.request.recv(4096).decode('utf-8') except socket.error: - print "=== socket error ===" + print("=== socket error ===") break except IOError: - print "=== socket closed ===" + print("=== socket closed ===") break if data == '': - print "=== socket closed ===" + print("=== socket closed ===") break - print "received: {}".format(data) + print("received: {}".format(data)) try: decoded = json.loads(data) except ValueError: - print "json decoding failed" - decoded = [0, ''] + print("json decoding failed") + decoded = [-1, ''] - if decoded[1] == 'hello!': - response = "got it" - else: - response = "what?" - encoded = json.dumps([decoded[0], response]) - print "sending {}".format(encoded) - self.request.sendall(encoded) + # Send a response if the sequence number is positive. + # Negative numbers are used for "eval" responses. + if decoded[0] >= 0: + if decoded[1] == 'hello!': + response = "got it" + else: + response = "what?" + encoded = json.dumps([decoded[0], response]) + print("sending {}".format(encoded)) + self.request.sendall(encoded.encode('utf-8')) thesocket = None -class ThreadedTCPServer(SocketServer.ThreadingMixIn, SocketServer.TCPServer): +class ThreadedTCPServer(socketserver.ThreadingMixIn, socketserver.TCPServer): pass if __name__ == "__main__": @@ -69,19 +79,19 @@ if __name__ == "__main__": # Exit the server thread when the main thread terminates server_thread.daemon = True server_thread.start() - print "Server loop running in thread: ", server_thread.name + print("Server loop running in thread: ", server_thread.name) - print "Listening on port {}".format(PORT) + print("Listening on port {}".format(PORT)) while True: typed = sys.stdin.readline() if "quit" in typed: - print "Goodbye!" + print("Goodbye!") break if thesocket is None: - print "No socket yet" + print("No socket yet") else: - print "sending {}".format(typed) - thesocket.sendall(typed) + print("sending {}".format(typed)) + thesocket.sendall(typed.encode('utf-8')) server.shutdown() server.server_close()