diff --git a/ox/web/google.py b/ox/web/google.py index 3e8aed6..c8c8c50 100644 --- a/ox/web/google.py +++ b/ox/web/google.py @@ -47,7 +47,7 @@ def find(query, max_results=DEFAULT_MAX_RESULTS, timeout=DEFAULT_TIMEOUT): >>> find("The Matrix site:imdb.com", 1)[0][1] u'http://www.imdb.com/title/tt0133093/' """ - _results = _find(query) + _results = _find(query, timeout=timeout) results = [] for r in _results: results.append((r['titleNoFormatting'], r['unescapedUrl'], stripTags(r['content']))) diff --git a/ox/web/youtube.py b/ox/web/youtube.py index 4d64f5a..9bfbf28 100644 --- a/ox/web/youtube.py +++ b/ox/web/youtube.py @@ -23,6 +23,10 @@ def getVideoKey(youtubeId, timeout=cache_timeout): return False def getVideoUrl(youtubeId, format='mp4', timeout=cache_timeout): + """ + youtubeId - if of video + format - video format, options: webm, 1080p, 720p, mp4, high + """ youtubeKey = getVideoKey(youtubeId, timeout=timeout) fmt = None