aboutsummaryrefslogtreecommitdiffstats
path: root/youtube_dl/extractor/googlesearch.py
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2016-10-28 23:19:59 +0700
committerSergey M․ <dstftw@gmail.com>2016-10-28 23:19:59 +0700
commitf3517569f60345a3948ce145fb603fe2a71b2d6f (patch)
tree4dc2e7d4f26c3136a81f981e1e4497039c751027 /youtube_dl/extractor/googlesearch.py
parentc725333d41ee1e19ae39f4378765dc6cc7c180c8 (diff)
downloadyoutube-dl-f3517569f60345a3948ce145fb603fe2a71b2d6f.zip
youtube-dl-f3517569f60345a3948ce145fb603fe2a71b2d6f.tar.gz
youtube-dl-f3517569f60345a3948ce145fb603fe2a71b2d6f.tar.bz2
[gvsearch] Modernize and fix page result request (closes #11051)
Diffstat (limited to 'youtube_dl/extractor/googlesearch.py')
-rw-r--r--youtube_dl/extractor/googlesearch.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/youtube_dl/extractor/googlesearch.py b/youtube_dl/extractor/googlesearch.py
index 498304c..5279fa8 100644
--- a/youtube_dl/extractor/googlesearch.py
+++ b/youtube_dl/extractor/googlesearch.py
@@ -4,9 +4,6 @@ import itertools
import re
from .common import SearchInfoExtractor
-from ..compat import (
- compat_urllib_parse,
-)
class GoogleSearchIE(SearchInfoExtractor):
@@ -34,13 +31,16 @@ class GoogleSearchIE(SearchInfoExtractor):
}
for pagenum in itertools.count():
- result_url = (
- 'http://www.google.com/search?tbm=vid&q=%s&start=%s&hl=en'
- % (compat_urllib_parse.quote_plus(query), pagenum * 10))
-
webpage = self._download_webpage(
- result_url, 'gvsearch:' + query,
- note='Downloading result page ' + str(pagenum + 1))
+ 'http://www.google.com/search',
+ 'gvsearch:' + query,
+ note='Downloading result page %s' % (pagenum + 1),
+ query={
+ 'tbm': 'vid',
+ 'q': query,
+ 'start': pagenum * 10,
+ 'hl': 'en',
+ })
for hit_idx, mobj in enumerate(re.finditer(
r'<h3 class="r"><a href="([^"]+)"', webpage)):