From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 5 Oct 2013 20:47:44 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/tox'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=226113c880f90e35dade151807b45138fb306af4;hp=79cfb46d42cf0cd296acf7f0689d2ad4b2e7f971

Merge remote-tracking branch 'origin/tox'
---

diff --git a/test/helper.py b/test/helper.py
index 63f56841f..8e641e3cb 100644
--- 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