jenkins-bot has submitted this change and it was merged.
Change subject: remove deprecated %n and %l format specifiers; version 0.7
......................................................................
remove deprecated %n and %l format specifiers; version 0.7
* '%l' and '%n' were deprecated in I07c6c7856. Remove them.
* Bump version to 0.7.
* Also fix silly test failure.
* Some unrelated linting.
Change-Id: I1a6336c00f07d91249e56f0c53ff55a2a585cb2c
---
M EventLogging.php
M server/eventlogging/__init__.py
M server/eventlogging/parse.py
M server/eventlogging/streams.py
M server/setup.py
M server/tests/fixtures.py
M server/tests/test_parser.py
7 files changed, 25 insertions(+), 33 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/EventLogging.php b/EventLogging.php
index e5e0f12..0a73521 100644
--- a/EventLogging.php
+++ b/EventLogging.php
@@ -9,7 +9,7 @@
*
* @author Ori Livneh <o...@wikimedia.org>
* @license GPL v2 or later
- * @version 0.6
+ * @version 0.7
*/
// Credits
@@ -23,7 +23,7 @@
'S Page',
'Matthew Flaschen',
),
- 'version' => '0.6',
+ 'version' => '0.7',
'url' => 'https://www.mediawiki.org/wiki/Extension:EventLogging',
'descriptionmsg' => 'eventlogging-desc'
);
diff --git a/server/eventlogging/__init__.py b/server/eventlogging/__init__.py
index 5de88c1..90ac75c 100644
--- a/server/eventlogging/__init__.py
+++ b/server/eventlogging/__init__.py
@@ -32,4 +32,4 @@
# :exc:`jsonschema.SchemaError`.
from jsonschema import ValidationError, SchemaError
-__version__ = '0.5'
+__version__ = '0.7'
diff --git a/server/eventlogging/parse.py b/server/eventlogging/parse.py
index 41cc4f6..9c0f83a 100644
--- a/server/eventlogging/parse.py
+++ b/server/eventlogging/parse.py
@@ -17,11 +17,7 @@
+========+=============================+
| %h | Client IP |
+--------+-----------------------------+
- | %j | JSON object |
- +--------+-----------------------------+
- | %l | Hostname of origin* |
- +--------+-----------------------------+
- | %n | Sequence ID* |
+ | %j | JSON event object |
+--------+-----------------------------+
| %q | Query-string-encoded JSON |
+--------+-----------------------------+
@@ -35,8 +31,6 @@
+--------+-----------------------------+
'..' is the desired property name for the capturing group.
-
- *: Deprecated; use "%{..}x"-style format specifiers instead.
"""
from __future__ import division, unicode_literals
diff --git a/server/eventlogging/streams.py b/server/eventlogging/streams.py
index 3ed94f7..c1a9eed 100644
--- a/server/eventlogging/streams.py
+++ b/server/eventlogging/streams.py
@@ -16,7 +16,7 @@
import zmq
-from .compat import items, urisplit
+from .compat import items
__all__ = ('iter_json', 'iter_unicode', 'make_canonical', 'pub_socket',
@@ -40,30 +40,30 @@
def pub_socket(endpoint):
"""Get a pre-configured ØMQ publisher."""
context = zmq.Context.instance()
- socket = context.socket(zmq.PUB)
+ sock = context.socket(zmq.PUB)
if hasattr(zmq, 'HWM'):
- socket.hwm = ZMQ_HIGH_WATER_MARK
- socket.linger = ZMQ_LINGER
- socket.sndbuf = SOCKET_BUFFER_SIZE
+ sock.hwm = ZMQ_HIGH_WATER_MARK
+ sock.linger = ZMQ_LINGER
+ sock.sndbuf = SOCKET_BUFFER_SIZE
canonical_endpoint = make_canonical(endpoint, host='*')
- socket.bind(canonical_endpoint)
- return socket
+ sock.bind(canonical_endpoint)
+ return sock
def sub_socket(endpoint, identity='', subscribe=''):
"""Get a pre-configured ØMQ subscriber."""
context = zmq.Context.instance()
- socket = context.socket(zmq.SUB)
+ sock = context.socket(zmq.SUB)
if hasattr(zmq, 'HWM'):
- socket.hwm = ZMQ_HIGH_WATER_MARK
- socket.linger = ZMQ_LINGER
- socket.rcvbuf = SOCKET_BUFFER_SIZE
- if identity and hasattr(socket, 'identity'):
- socket.identity = identity.encode('utf-8')
+ sock.hwm = ZMQ_HIGH_WATER_MARK
+ sock.linger = ZMQ_LINGER
+ sock.rcvbuf = SOCKET_BUFFER_SIZE
+ if identity and hasattr(sock, 'identity'):
+ sock.identity = identity.encode('utf-8')
canonical_endpoint = make_canonical(endpoint)
- socket.connect(canonical_endpoint)
- socket.subscribe = subscribe.encode('utf-8')
- return socket
+ sock.connect(canonical_endpoint)
+ sock.subscribe = subscribe.encode('utf-8')
+ return sock
def udp_socket(hostname, port):
diff --git a/server/setup.py b/server/setup.py
index 7cfe5c3..ed6f6fb 100644
--- a/server/setup.py
+++ b/server/setup.py
@@ -19,7 +19,7 @@
setup(
name='eventlogging',
- version='0.6',
+ version='0.7',
license='GPL',
author='Ori Livneh',
author_email='o...@wikimedia.org',
diff --git a/server/tests/fixtures.py b/server/tests/fixtures.py
index 1fb9a5c..160d872 100644
--- a/server/tests/fixtures.py
+++ b/server/tests/fixtures.py
@@ -9,7 +9,6 @@
from __future__ import unicode_literals
import copy
-import io
import signal
import eventlogging
diff --git a/server/tests/test_parser.py b/server/tests/test_parser.py
index 54b8ce9..23705de 100644
--- a/server/tests/test_parser.py
+++ b/server/tests/test_parser.py
@@ -31,10 +31,9 @@
maxDiff = None
def test_parse_client_side_events(self):
- """Parser test: client-side events
- (%q %{recvFrom}s %{seqId}d %t %h %{userAgent}i)."""
- parser = eventlogging.LogParser('%q %{recvFrom}s %{seqId}d %t %h'
- '%{userAgent}i')
+ """Parser test: client-side events."""
+ parser = eventlogging.LogParser(
+ '%q %{recvFrom}s %{seqId}d %t %h %{userAgent}i')
raw = ('?%7B%22wiki%22%3A%22testwiki%22%2C%22schema%22%3A%22Generic'
'%22%2C%22revision%22%3A13%2C%22clientValidated%22%3Atrue%2C'
'%22event%22%3A%7B%22articleId%22%3A1%2C%22articleTitle%22%3'
@@ -61,7 +60,7 @@
self.assertEqual(parser.parse(raw), parsed)
def test_parser_server_side_events(self):
- """Parser test: server-side events (%n EventLogging %j)."""
+ """Parser test: server-side events."""
parser = eventlogging.LogParser('%n EventLogging %j')
raw = ('99 EventLogging {"revision":123,"timestamp":1358627115,"sche'
'ma":"FakeSchema","clientValidated":true,"wiki":"enwiki","eve'
--
To view, visit https://gerrit.wikimedia.org/r/113524
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1a6336c00f07d91249e56f0c53ff55a2a585cb2c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
