Remove dependency on legacy mock package and other Python2isms

sync2jira/upstream_issue.py

@@ -18,14 +18,7 @@
 # Authors:  Ralph Bean <[email protected]>
 
 import logging
-
-try:
-    from urllib.parse import urlencode  # py3
-    string_type = str
-except ImportError:
-    from urllib import urlencode  # py2
-    import types
-    string_type = types.StringTypes
+from urllib.parse import urlencode
 
 import requests
 from github import Github
@@ -136,7 +129,7 @@ def handle_pagure_message(msg, config):
                 # Some messages send tags as strings, others as dicts.  Handle both.
                 actual = \
                     [tag['name'] for tag in actual if isinstance(tag, dict)] + \
-                    [tag for tag in actual if isinstance(tag, string_type)]
+                    [tag for tag in actual if isinstance(tag, str)]
 
                 intersection = set(actual) & set(expected)
                 if not intersection:

sync2jira/upstream_pr.py

@@ -19,12 +19,6 @@
 
 import logging
 
-try:
-    string_type = str
-except ImportError:
-    import types
-    string_type = types.StringTypes
-
 from github import Github
 
 import sync2jira.intermediary as i

test-requirements.txt

@@ -1,5 +1,4 @@
-python-coveralls
 coverage
 pytest
 pytest-cov
-mock
+python-coveralls

tests/test_downstream_issue.py

@@ -1,10 +1,6 @@
-import mock
 import unittest
-try:
-    # Python 3.3 >
-    from unittest.mock import MagicMock  # noqa: F401
-except ImportError:
-    from mock import MagicMock  # noqa: F401
+import unittest.mock as mock
+from unittest.mock import MagicMock
 from datetime import datetime
 
 import sync2jira.downstream_issue as d

tests/test_downstream_pr.py

@@ -1,10 +1,6 @@
 import unittest
-import mock
-try:
-    # Python 3.3 >
-    from unittest.mock import MagicMock  # noqa: F401
-except ImportError:
-    from mock import MagicMock  # noqa: F401
+import unittest.mock as mock
+from unittest.mock import MagicMock
 
 import sync2jira.downstream_pr as d
 

tests/test_intermediary.py

@@ -1,6 +1,5 @@
-from datetime import datetime
-import mock
 import unittest
+import unittest.mock as mock
 
 import sync2jira.intermediary as i
 

tests/test_main.py

@@ -1,10 +1,6 @@
-import mock
 import unittest
-try:
-    # Python 3.3 >
-    from unittest.mock import MagicMock  # noqa: F401
-except ImportError:
-    from mock import MagicMock  # noqa: F401
+import unittest.mock as mock
+from unittest.mock import MagicMock
 
 import sync2jira.main as m
 

tests/test_upstream_issue.py

@@ -1,11 +1,6 @@
-import mock
 import unittest
-try:
-    # Python 3.3 >
-    from unittest.mock import MagicMock  # noqa: F401
-except ImportError:
-    from mock import MagicMock  # noqa: F401
-
+import unittest.mock as mock
+from unittest.mock import MagicMock
 
 import sync2jira.upstream_issue as u
 

tests/test_upstream_pr.py

@@ -1,11 +1,6 @@
-import mock
 import unittest
-try:
-    # Python 3.3 >
-    from unittest.mock import MagicMock  # noqa: F401
-except ImportError:
-    from mock import MagicMock  # noqa: F401
-
+import unittest.mock as mock
+from unittest.mock import MagicMock
 
 import sync2jira.upstream_pr as u