Intermediate changes

commit_hash:6b9536340f4f2533b62d862c22cbfeb121d4fa3f

2 files changed, 16 insertions, 3 deletions

diff --git a/contrib/python/PyHamcrest/py3/hamcrest/core/helpers/ismock.py b/contrib/python/PyHamcrest/py3/hamcrest/core/helpers/ismock.py
new file mode 100644
index 00000000000..318e0d4f9cb
--- /dev/null
+++ b/contrib/python/PyHamcrest/py3/hamcrest/core/helpers/ismock.py
@@ -0,0 +1,15 @@
+MOCKTYPES = ()
+try:
+    from mock import Mock
+    MOCKTYPES += (Mock,)
+except ImportError:
+    pass
+try:
+    from unittest.mock import Mock
+    MOCKTYPES += (Mock,)
+except ImportError:
+    pass
+
+
+def ismock(obj):
+    return isinstance(obj, MOCKTYPES)
diff --git a/contrib/python/PyHamcrest/py3/hamcrest/core/helpers/wrap_matcher.py b/contrib/python/PyHamcrest/py3/hamcrest/core/helpers/wrap_matcher.py
index a5b506fb395..587ae4c6101 100644
--- a/contrib/python/PyHamcrest/py3/hamcrest/core/helpers/wrap_matcher.py
+++ b/contrib/python/PyHamcrest/py3/hamcrest/core/helpers/wrap_matcher.py
@@ -28,9 +28,7 @@ def is_matchable_type(expected_type):
     if isinstance(expected_type, six.class_types):
         return True
 
-    if isinstance(expected_type, tuple) and \
-       expected_type and \
-       all(map(is_matchable_type, expected_type)):
+    if isinstance(expected_type, tuple) and all(map(is_matchable_type, expected_type)):
         return True
 
     return False