Merge pull request #297 from consideRatio/fix-mediawiki-with-0.3.7-mw…

…oauth

mediawiki: utf-8 > binary strings, req. mwoauth>=0.3.7

oauthenticator/mediawiki.py

@@ -33,14 +33,14 @@
 # It is a named tuple with bytestrings, json.dumps balks
 def jsonify(request_token):
     return json.dumps([
-        request_token.key.decode('utf-8'),
-        request_token.secret.decode('utf-8')
+        request_token.key,
+        request_token.secret,
     ])
 
 
 def dejsonify(js):
-    key, secret = json.loads(js.decode('utf-8'))
-    return RequestToken(key.encode('utf-8'), secret.encode('utf-8'))
+    key, secret = json.loads(js)
+    return RequestToken(key, secret)
 
 
 class MWLoginHandler(BaseHandler):
@@ -135,8 +135,8 @@ async def authenticate(self, handler, data=None):
             return {
                 'name': identity['username'].replace(' ', '_'),
                 'auth_state': {
-                    'ACCESS_TOKEN_KEY': access_token.key.decode('utf-8'),
-                    'ACCESS_TOKEN_SECRET': access_token.secret.decode('utf-8'),
+                    'ACCESS_TOKEN_KEY': access_token.key,
+                    'ACCESS_TOKEN_SECRET': access_token.secret,
                     'MEDIAWIKI_USER_IDENTITY': identity,
 
                 }

oauthenticator/tests/test_mediawiki.py

@@ -53,7 +53,7 @@ async def test_mediawiki(mediawiki):
         get_secure_cookie=Mock(
             return_value=json.dumps(
                 ['key', 'secret']
-            ).encode('utf8')
+            )
         ),
         request=Mock(
             query='oauth_token=key&oauth_verifier=me'

test-requirements.txt

@@ -3,7 +3,7 @@
 codecov
 flake8
 pyjwt
-mwoauth != 0.3.1, != 0.3.5
+mwoauth >= 0.3.7
 pytest >= 2.8
 pytest-cov
 pytest-asyncio