Merge remote-tracking branch 'origin/tox'

diff --git a/test/helper.py b/test/helper.py
index 63f56841fa35439f5b691361dab9dfb5a962bb9c..8e641e3cb3054adada433b52d0a4f4ee52ad6631 100644 (file)
--- a/test/helper.py
+++ b/test/helper.py
@@ -34,12 +34,6 @@ class FakeYDL(YoutubeDL):
         raise Exception(s)
     def download(self, x):
         self.result.append(x)
-    # def expect_warning(self, regex):
-    #     # Silence an expected warning matching a regex
-    #     def report_warning(self, message):
-    #         if re.match(regex, message): return
-    #         super(FakeYDL, self).report_warning(regex)
-    #     self.report_warning = types.MethodType(report_warning, self)
     def expect_warning(self, regex):
         # Silence an expected warning matching a regex
         old_report_warning = self.report_warning