Remove old import compatibility checks:

I also went ahead and removed the `mock` package imports since `mock` is built
into the stdlib now. In a future PR we can remove the mock package altogether,
though it's fine to leave in for now.

Author: dosisod

requests_oauthlib/compliance_fixes/facebook.py

@@ -1,9 +1,5 @@
 from json import dumps
-
-try:
-    from urlparse import parse_qsl
-except ImportError:
-    from urllib.parse import parse_qsl
+from urllib.parse import parse_qsl
 
 
 def facebook_compliance_fix(session):

requests_oauthlib/compliance_fixes/instagram.py

@@ -1,7 +1,4 @@
-try:
-    from urlparse import urlparse, parse_qs
-except ImportError:
-    from urllib.parse import urlparse, parse_qs
+from urllib.parse import urlparse, parse_qs
 
 from oauthlib.common import add_params_to_uri
 

requests_oauthlib/compliance_fixes/slack.py

@@ -1,7 +1,4 @@
-try:
-    from urlparse import urlparse, parse_qs
-except ImportError:
-    from urllib.parse import urlparse, parse_qs
+from urllib.parse import urlparse, parse_qs
 
 from oauthlib.common import add_params_to_uri
 

requests_oauthlib/oauth1_session.py

@@ -1,9 +1,6 @@
 from __future__ import unicode_literals
 
-try:
-    from urlparse import urlparse
-except ImportError:
-    from urllib.parse import urlparse
+from urllib.parse import urlparse
 
 import logging
 

tests/test_compliance_fixes.py

@@ -5,10 +5,7 @@
 import requests_mock
 import time
 
-try:
-    from urlparse import urlparse, parse_qs
-except ImportError:
-    from urllib.parse import urlparse, parse_qs
+from urllib.parse import urlparse, parse_qs
 
 from oauthlib.oauth2.rfc6749.errors import InvalidGrantError
 from requests_oauthlib import OAuth2Session

tests/test_core.py

@@ -7,10 +7,7 @@
 from io import StringIO
 import unittest
 
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 
 @mock.patch("oauthlib.oauth1.rfc5849.generate_timestamp")

tests/test_oauth1_session.py

@@ -2,16 +2,12 @@
 import unittest
 import requests
 from io import StringIO
+from unittest import mock
 
 from oauthlib.oauth1 import SIGNATURE_TYPE_QUERY, SIGNATURE_TYPE_BODY
 from oauthlib.oauth1 import SIGNATURE_RSA, SIGNATURE_PLAINTEXT
 from requests_oauthlib import OAuth1Session
 
-try:
-    from unittest import mock
-except ImportError:
-    import mock
-
 try:
     import cryptography
 except ImportError:

tests/test_oauth2_session.py

@@ -8,10 +8,7 @@
 from copy import deepcopy
 from unittest import TestCase
 
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 from oauthlib.common import urlencode
 from oauthlib.oauth2 import TokenExpiredError, OAuth2Error