Merge tag 'upstream/2015.11.27.1'

[youtubedl] / youtube_dl / extractor / googlesearch.py

diff --git a/youtube_dl/extractor/googlesearch.py b/youtube_dl/extractor/googlesearch.py
index 5c25642702993f1ec344ce9a0d4967fffedc760a..498304cb2bd9b605d44e67291a2f38bf4481a6f8 100644 (file)
--- a/youtube_dl/extractor/googlesearch.py
+++ b/youtube_dl/extractor/googlesearch.py
@@ -4,7 +4,7 @@ import itertools
 import re
 
 from .common import SearchInfoExtractor
 import re
 
 from .common import SearchInfoExtractor

-from ..utils import (
+from ..compat import (

     compat_urllib_parse,
 )
 
     compat_urllib_parse,
 )
 


@@ -14,6 +14,14 @@ class GoogleSearchIE(SearchInfoExtractor):
     _MAX_RESULTS = 1000
     IE_NAME = 'video.google:search'
     _SEARCH_KEY = 'gvsearch'
     _MAX_RESULTS = 1000
     IE_NAME = 'video.google:search'
     _SEARCH_KEY = 'gvsearch'

+    _TEST = {
+        'url': 'gvsearch15:python language',
+        'info_dict': {
+            'id': 'python language',
+            'title': 'python language',
+        },
+        'playlist_count': 15,
+    }

 
     def _get_n_results(self, query, n):
         """Get a specified number of results for a query"""
 
     def _get_n_results(self, query, n):
         """Get a specified number of results for a query"""


@@ -46,6 +54,6 @@ class GoogleSearchIE(SearchInfoExtractor):
                     'url': mobj.group(1)
                 })
 
                     'url': mobj.group(1)
                 })
 

-            if (len(entries) >= n) or not re.search(r'class="pn" id="pnnext"', webpage):
+            if (len(entries) >= n) or not re.search(r'id="pnnext"', webpage):

                 res['entries'] = entries[:n]
                 return res
                 res['entries'] = entries[:n]
                 return res