Browse Source

Fix lazy loading bug where lxml.etree wasn't accessible to bs4.

tags/v0.3
Ben Kurtovic 8 years ago
parent
commit
a463c6d052
1 changed files with 4 additions and 4 deletions
  1. +4
    -4
      earwigbot/wiki/copyvios/search.py

+ 4
- 4
earwigbot/wiki/copyvios/search.py View File

@@ -31,7 +31,7 @@ from urllib2 import URLError
from earwigbot import importer from earwigbot import importer
from earwigbot.exceptions import SearchQueryError from earwigbot.exceptions import SearchQueryError


etree = importer.new("lxml.etree")
lxml = importer.new("lxml")
oauth = importer.new("oauth2") oauth = importer.new("oauth2")


__all__ = ["BingSearchEngine", "GoogleSearchEngine", "YahooBOSSSearchEngine", __all__ = ["BingSearchEngine", "GoogleSearchEngine", "YahooBOSSSearchEngine",
@@ -228,7 +228,7 @@ class YandexSearchEngine(_BaseSearchEngine):


@staticmethod @staticmethod
def requirements(): def requirements():
return ["lxml"]
return ["lxml.etree"]


def search(self, query): def search(self, query):
"""Do a Yandex web search for *query*. """Do a Yandex web search for *query*.
@@ -252,9 +252,9 @@ class YandexSearchEngine(_BaseSearchEngine):
result = self._open(url + urlencode(params)) result = self._open(url + urlencode(params))


try: try:
data = etree.fromstring(result)
data = lxml.etree.fromstring(result)
return [elem.text for elem in data.xpath(".//url")] return [elem.text for elem in data.xpath(".//url")]
except etree.Error as exc:
except lxml.etree.Error as exc:
raise SearchQueryError("Yandex XML parse error: " + str(exc)) raise SearchQueryError("Yandex XML parse error: " + str(exc))






Loading…
Cancel
Save