Merge tag 'upstream/2013.11.11'

[youtubedl] / youtube_dl / extractor / googlesearch.py

diff --git a/youtube_dl/extractor/googlesearch.py b/youtube_dl/extractor/googlesearch.py
index 21c240e512b6c544efa616d95fcb1b0a76865a8a..f9c88e9b5328a035cda2abe1014a015fceff2ed7 100644 (file)
--- a/youtube_dl/extractor/googlesearch.py
+++ b/youtube_dl/extractor/googlesearch.py
@@ -8,7 +8,7 @@ from ..utils import (
 
 
 class GoogleSearchIE(SearchInfoExtractor):
 
 
 class GoogleSearchIE(SearchInfoExtractor):

-    """Information Extractor for Google Video search queries."""
+    IE_DESC = u'Google Video search'

     _MORE_PAGES_INDICATOR = r'id="pnnext" class="pn"'
     _MAX_RESULTS = 1000
     IE_NAME = u'video.google:search'
     _MORE_PAGES_INDICATOR = r'id="pnnext" class="pn"'
     _MAX_RESULTS = 1000
     IE_NAME = u'video.google:search'