diff --git a/ox/web/opensubtitles.py b/ox/web/opensubtitles.py index 7684402..2346a7d 100644 --- a/ox/web/opensubtitles.py +++ b/ox/web/opensubtitles.py @@ -2,12 +2,12 @@ # vi:si:et:sw=4:sts=4:ts=4 import re -import feedparser from ox.cache import read_url from ox import find_re, strip_tags from ox.iso import langCode2To3, langTo3Code def find_subtitles(imdb, parts = 1, language = "eng"): + import feedparser if len(language) == 2: language = langCode2To3(language) elif len(language) != 3: diff --git a/ox/web/youtube.py b/ox/web/youtube.py index 6a0ac3f..805f716 100644 --- a/ox/web/youtube.py +++ b/ox/web/youtube.py @@ -7,7 +7,6 @@ import re from xml.dom.minidom import parseString import json -import feedparser import ox from ox.cache import read_url, cache_timeout @@ -61,6 +60,7 @@ def get_video_info(id): return info def find(query, max_results=10, offset=1, orderBy='relevance'): + import feedparser query = quote(query) url = "http://gdata.youtube.com/feeds/api/videos?vq=%s&orderby=%s&start-index=%s&max-results=%s" % (query, orderBy, offset, max_results) data = read_url(url) diff --git a/requirements.txt b/requirements.txt index e611b3e..b7509ec 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ chardet -feedparser six>=1.5.2 diff --git a/setup.py b/setup.py index 34bb2af..89fc803 100644 --- a/setup.py +++ b/setup.py @@ -50,7 +50,7 @@ setup( download_url="https://code.0x2620.org/python-ox/download", license="GPLv3", packages=['ox', 'ox.torrent', 'ox.web'], - install_requires=['six>=1.5.2', 'chardet', 'feedparser'], + install_requires=['six>=1.5.2', 'chardet'], keywords=[ ], classifiers=[