Ottomata has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391019 )

Change subject: Parse userAgent if it is a (str, unicode)
......................................................................

Parse userAgent if it is a (str, unicode)

This failed in production (but not beta?) because the
%{userAgent}i parsed string was a unicode string.

Bug: T179625
Change-Id: Ic4d642790085945e0a93907f947cc660b3ef479e
---
M eventlogging/parse.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/eventlogging 
refs/changes/19/391019/1

diff --git a/eventlogging/parse.py b/eventlogging/parse.py
index ebf7093..a47a5d2 100644
--- a/eventlogging/parse.py
+++ b/eventlogging/parse.py
@@ -190,7 +190,7 @@
 
         # TODO: remove this code in favor of %u format specifier
         # after %{userAgent}i is not used. T179625
-        if 'userAgent' in event and isinstance(event['userAgent'], str):
+        if 'userAgent' in event and isinstance(event['userAgent'], (str, 
unicode)):
             event['userAgent'] = json.dumps(parse_ua(event['userAgent']))
         return Event(event)
 

-- 
To view, visit https://gerrit.wikimedia.org/r/391019
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4d642790085945e0a93907f947cc660b3ef479e
Gerrit-PatchSet: 1
Gerrit-Project: eventlogging
Gerrit-Branch: master
Gerrit-Owner: Ottomata <ao...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to