Merge tag 'upstream/2013.12.23'

[youtubedl] / test / helper.py

diff --git a/test/helper.py b/test/helper.py
index d7bf7a82802e58f0a80d788de83146d3a9d3fadf..b1f421ac58331bad23328502f42a0e1316df853d 100644 (file)
--- a/test/helper.py
+++ b/test/helper.py
@@ -12,10 +12,6 @@ from youtube_dl import YoutubeDL
 from youtube_dl.utils import preferredencoding
 
 
-def global_setup():
-    youtube_dl._setup_opener(timeout=10)
-
-
 def get_params(override=None):
     PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)),
                                    "parameters.json")