From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 29 Nov 2012 15:35:57 +0000 (+0100)
Subject: Fix 2.6 nosetests
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=8af4ed7b4fb20190ec72e9ab6347e99deabe9bce;p=youtube-dl.git

Fix 2.6 nosetests
---

diff --git a/test/gentests.py b/test/gentests.py
index da4e3c2f6..6f82ae8fa 100755
--- a/test/gentests.py
+++ b/test/gentests.py
@@ -52,13 +52,14 @@ try:
 except AttributeError: # Python 2.6
     def _skip_unless(cond, reason='No reason given'):
         def resfunc(f):
-            def wfunc(*args, **kwargs):
+            # Start the function name with test to appease nosetests-2.6
+            def test_wfunc(*args, **kwargs):
                 if cond:
                     return f(*args, **kwargs)
                 else:
                     print('Skipped test')
                     return
-            return wfunc
+            return test_wfunc
         return resfunc
 _skip = lambda *args, **kwargs: _skip_unless(False, *args, **kwargs)
 
diff --git a/test/test_download.py b/test/test_download.py
index 0072d4aab..00b9a487b 100644
--- a/test/test_download.py
+++ b/test/test_download.py
@@ -38,13 +38,14 @@ try:
 except AttributeError: # Python 2.6
     def _skip_unless(cond, reason='No reason given'):
         def resfunc(f):
-            def wfunc(*args, **kwargs):
+            # Start the function name with test to appease nosetests-2.6
+            def test_wfunc(*args, **kwargs):
                 if cond:
                     return f(*args, **kwargs)
                 else:
                     print('Skipped test')
                     return
-            return wfunc
+            return test_wfunc
         return resfunc
 _skip = lambda *args, **kwargs: _skip_unless(False, *args, **kwargs)