From 00e69b3df6af03273541c3ccc553db8f0d92c35c Mon Sep 17 00:00:00 2001 From: adfoster-r7 <alandavid_foster@rapid7.com> Date: Tue, 19 Sep 2023 23:10:38 +0100 Subject: [PATCH] Fix python unittest deprecation warning --- python/meterpreter/tests/test_ext_server_stdapi.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/python/meterpreter/tests/test_ext_server_stdapi.py b/python/meterpreter/tests/test_ext_server_stdapi.py index 4ed4181f..6989a9cd 100644 --- a/python/meterpreter/tests/test_ext_server_stdapi.py +++ b/python/meterpreter/tests/test_ext_server_stdapi.py @@ -73,11 +73,11 @@ class ExtServerStdApiTest(unittest.TestCase): self.assertIsInstance(result[1], bytes) def assertRegex(self, text, regexp, msg=None): - # Python 2.7 - if self.assertRegexpMatches: - self.assertRegexpMatches(text, regexp, msg) + if hasattr(super(self.__class__.__bases__[0], self), 'assertRegex'): + super(self.__class__.__bases__[0], self).assertRegex(text, regexp, msg) else: - super().assertRegex(text, regexp, msg) + # Python 2.7 fallback + self.assertRegexpMatches(text, regexp, msg) class ExtServerStdApiNetworkTest(ExtServerStdApiTest):