Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/49475
Change subject: Python 3 support for dev server.
......................................................................
Python 3 support for dev server.
Change-Id: I16f364159200ff871075a490d69ba26d580c40aa
---
M server/bin/eventlogging-devserver
1 file changed, 11 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventLogging
refs/changes/75/49475/1
diff --git a/server/bin/eventlogging-devserver
b/server/bin/eventlogging-devserver
index 6f8378c..b406341 100755
--- a/server/bin/eventlogging-devserver
+++ b/server/bin/eventlogging-devserver
@@ -34,10 +34,9 @@
import eventlogging
import jsonschema
-from pygments import highlight
+from pygments import highlight, lexers
from pygments.console import ansiformat
from pygments.formatters import TerminalFormatter
-from pygments.lexers import JSONLexer
argparser = argparse.ArgumentParser()
@@ -47,7 +46,7 @@
help='server port (default: 8080)')
args = argparser.parse_args()
-lexer = JSONLexer()
+lexer = lexers.get_lexer_by_name('json')
formatter = TerminalFormatter()
server_software = 'EventLogging/%s' % eventlogging.__version__
@@ -58,10 +57,15 @@
'%(TIME)s %(REMOTE_ADDR)s')
-def make_headers(map):
+def prepare_response(status, headers):
"""Encode a dictionary of HTTP headers to a list of tuples
containing bytes."""
- return [(k.encode('utf-8'), v.encode('utf-8')) for k, v in map.items()]
+ if eventlogging.compat.PY3:
+ return status, list(headers.items())
+ status = status.encode('utf-8')
+ headers = [(k.encode('utf-8'), v.encode('utf-8')) for k, v in
+ headers.iteritems()]
+ return status, headers
class EventLoggingHandler(WSGIRequestHandler):
@@ -113,8 +117,8 @@
for i, error in enumerate(errors):
headers['Validation-Error-%d' % i] = str(error)
-
- start_response(b'204 No Content', make_headers(headers))
+ status, headers = prepare_response('204 No Content', headers)
+ start_response(status, headers)
print('── request ────────────')
print(log_line)
--
To view, visit https://gerrit.wikimedia.org/r/49475
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I16f364159200ff871075a490d69ba26d580c40aa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
