Merge branch 'a-detiste-master'

Author: Aaron Halfaker

README.rst

@@ -3,7 +3,7 @@ MediaWiki OAuth Library
 
 ``mwoauth`` is an open licensed (MIT) library designed to provide a simple means to performing an OAuth handshake with a MediaWiki installation with the `OAuth Extension <https://www.mediawiki.org/wiki/Extension:OAuth>`_ installed.  
 
-**Compatible with python 2.7 and 3.x**
+**Compatible with python 3.x**
 
 **Install with pip:** ``pip install mwoauth``
 
@@ -15,7 +15,6 @@ Usage
 .. code-block:: python
 
 	from mwoauth import ConsumerToken, Handshaker
-	from six.moves import input # For compatibility between python 2 and 3
 	
 	# Construct a "consumer" from the key/secret provided by MediaWiki
 	import config

examples/functions.py

@@ -3,8 +3,6 @@
 
 from mwoauth import ConsumerToken, complete, identify, initiate
 
-from six.moves import input  # For compatibility between python 2 and 3
-
 sys.path.insert(0, ".")
 
 try:

examples/handshaker.py

@@ -3,8 +3,6 @@
 
 from mwoauth import ConsumerToken, Handshaker
 
-from six.moves import input  # For compatibility between python 2 and 3
-
 try:
     creds_doc = json.load(open("credentials.do_not_commit.json"))
     consumer_key = creds_doc['consumer_key']

examples/request-oauthlib.py

@@ -4,8 +4,6 @@
 from mwoauth import ConsumerToken, Handshaker
 from requests_oauthlib import OAuth1
 
-from six.moves import input  # For compatibility between python 2 and 3
-
 try:
     creds_doc = json.load(open("credentials.do_not_commit.json"))
     consumer_key = creds_doc['consumer_key']

mwoauth/about.py

@@ -1,5 +1,5 @@
 __name__ = "mwoauth"
-__version__ = "0.3.8"
+__version__ = "0.4.0"
 __author__ = "Aaron Halfaker / Filippo Valsorda"
 __author_email__ = "aaron.halfaker@gmail.com"
 __description__ = "A generic MediaWiki OAuth handshake helper."

mwoauth/flask.py

@@ -8,12 +8,11 @@
 
 import logging
 from functools import wraps
+from urllib.parse import urljoin
 
 import flask
 from requests_oauthlib import OAuth1
 
-from six.moves.urllib.parse import urljoin
-
 from .errors import OAuthException
 from .handshaker import Handshaker
 from .tokens import AccessToken, RequestToken

mwoauth/functions.py

@@ -6,7 +6,6 @@
     .. code-block:: python
 
         from mwoauth import ConsumerToken, initiate, complete, identify
-        from six.moves import input # For compatibility between python 2 and 3
 
         # Consruct a "consumer" from the key/secret provided by MediaWiki
         import config
@@ -35,27 +34,22 @@
 import json
 import re
 import time
+from urllib.parse import parse_qs, urlencode, urlparse
 
 import jwt
 import requests
 from requests_oauthlib import OAuth1
-from six import PY3, text_type
-
-from six.moves.urllib.parse import parse_qs, urlencode, urlparse
 
 from . import defaults
 from .errors import OAuthException
 from .tokens import AccessToken, RequestToken
 
 
 def force_unicode(val, encoding="unicode-escape"):
-    if type(val) == text_type:
+    if type(val) == str:
         return val
     else:
-        if PY3:
-            return val.decode(encoding, errors="replace")
-        else:
-            return unicode(val, encoding, errors="replace")  # noqa
+        return val.decode(encoding, errors="replace")
 
 
 def initiate(mw_uri, consumer_token, callback='oob',

mwoauth/handshaker.py

@@ -5,7 +5,6 @@
     .. code-block:: python
 
         from mwoauth import ConsumerToken, Handshaker
-        from six.moves import input # For compatibility between python 2 and 3
 
         # Consruct a "consumer" from the key/secret provided by MediaWiki
         import config

mwoauth/tests/test_functions.py

@@ -1,29 +1,23 @@
 # -*- coding: UTF-8 -*-
 import pytest
-from six import PY3, b
 
 from ..errors import OAuthException
 from ..functions import process_request_token
 
 
 def test_process_request_token():
     request_token = process_request_token(
-        b("oauth_token=iamatoken&oauth_token_secret=iamasecret"))
+        "oauth_token=iamatoken&oauth_token_secret=iamasecret")
     assert request_token.key == "iamatoken"
     assert request_token.secret == "iamasecret"
 
 
 def test_process_request_token_errors():
-    if PY3:
-        text = "Error: Произошла ошибка в протоколе OAuth: " + \
-               "Invalid consumer key"
-        content = bytes(text, "utf-8")
-    else:
-        content = "Error: Произошла ошибка в протоколе OAuth: " + \
-                  "Invalid consumer key"
-        text = unicode(content, "utf-8")
+    text = "Error: Произошла ошибка в протоколе OAuth: " + \
+           "Invalid consumer key"
+    #content = bytes(text, "utf-8")
     with pytest.raises(OAuthException, match=text[len("Error: "):]):
-        process_request_token(content)
+        process_request_token(text)
 
     with pytest.raises(OAuthException, match="I am an error"):
         process_request_token("Error: I am an error")

requirements.txt

@@ -1,4 +1,3 @@
 PyJWT == 2.4.0
 requests == 2.21.0
 requests-oauthlib == 1.2.0
-six == 1.12.0