Remove py2 compatibility-related ifs

gyermolenko · gyermolenko · commit 10c71971ff27 · 2019-11-02T12:23:58.000+02:00
diff --git a/patterns/creational/pool.py b/patterns/creational/pool.py
@@ -54,10 +54,7 @@ def __del__(self):
 
 
 def main():
-    try:
-        import queue
-    except ImportError:  # python 2.x compatibility
-        import Queue as queue
+    import queue
 
     def test_object(queue):
         pool = ObjectPool(queue, True)
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -3,5 +3,3 @@
 pytest~=4.3.0
 pytest-cov~=2.6.0
 flake8~=3.7.0
-
-mock~=2.0.0; python_version < "3.*"
diff --git a/tests/behavioral/test_observer.py b/tests/behavioral/test_observer.py
@@ -1,12 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import unittest
-from patterns.behavioral.observer import Subject, Data, DecimalViewer, HexViewer
+from unittest.mock import patch
 
-try:
-    from unittest.mock import patch
-except ImportError:
-    from mock import patch
+from patterns.behavioral.observer import Subject, Data, DecimalViewer, HexViewer
 
 
 class TestSubject(unittest.TestCase):
diff --git a/tests/behavioral/test_publish_subscribe.py b/tests/behavioral/test_publish_subscribe.py
@@ -1,13 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import unittest
+from unittest.mock import patch, call
 from patterns.behavioral.publish_subscribe import Provider, Publisher, Subscriber
 
-try:
-    from unittest.mock import patch, call
-except ImportError:
-    from mock import patch, call
-
 
 class TestProvider(unittest.TestCase):
     """
diff --git a/tests/creational/test_abstract_factory.py b/tests/creational/test_abstract_factory.py
@@ -1,12 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import unittest
-from patterns.creational.abstract_factory import PetShop, Dog
+from unittest.mock import patch
 
-try:
-    from unittest.mock import patch
-except ImportError:
-    from mock import patch
+from patterns.creational.abstract_factory import PetShop, Dog
 
 
 class TestPetShop(unittest.TestCase):
diff --git a/tests/creational/test_pool.py b/tests/creational/test_pool.py
@@ -1,11 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import unittest
+import queue
 
-try:
-    import queue
-except ImportError:  # python 2.x compatibility
-    import Queue as queue
 from patterns.creational.pool import ObjectPool
 
 
diff --git a/tests/structural/test_bridge.py b/tests/structural/test_bridge.py
@@ -1,12 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import unittest
-from patterns.structural.bridge import DrawingAPI1, DrawingAPI2, CircleShape
+from unittest.mock import patch
 
-try:
-    from unittest.mock import patch
-except ImportError:
-    from mock import patch
+from patterns.structural.bridge import DrawingAPI1, DrawingAPI2, CircleShape
 
 
 class BridgeTest(unittest.TestCase):
diff --git a/tests/structural/test_proxy.py b/tests/structural/test_proxy.py
@@ -3,12 +3,9 @@
 import sys
 from time import time
 import unittest
-from patterns.structural.proxy import Proxy, NoTalkProxy
+from io import StringIO
 
-if sys.version_info[0] == 2:
-    from StringIO import StringIO
-else:
-    from io import StringIO
+from patterns.structural.proxy import Proxy, NoTalkProxy
 
 
 class ProxyTest(unittest.TestCase):
diff --git a/tests/test_hsm.py b/tests/test_hsm.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import unittest
+from unittest.mock import patch
+
 from patterns.other.hsm.hsm import (
     HierachicalStateMachine,
     UnsupportedMessageType,
@@ -11,11 +13,6 @@
     Suspect,
 )
 
-try:
-    from unittest.mock import patch
-except ImportError:
-    from mock import patch
-
 
 class HsmMethodTest(unittest.TestCase):
     @classmethod
diff --git a/tests/test_outputs.py b/tests/test_outputs.py
@@ -1,10 +1,5 @@
-try:
-    from contextlib import redirect_stdout
-except:
-    pass
-
+from contextlib import redirect_stdout
 import io
-import sys
 
 import pytest
 
@@ -16,8 +11,6 @@
 from patterns.behavioral.state import OUTPUT as state_output
 
 
-@pytest.mark.skipif(sys.version_info < (3,4),
-                    reason="requires python3.4 or higher")
 @pytest.mark.parametrize("main,output", [
     (publish_subscribe_main, publish_subscribe_output),
     (specification_main, specification_output),
