From 7dbbe9683cbe6799528e8a7d8f6c1104f9813e67 Mon Sep 17 00:00:00 2001 From: Ben Kurtovic Date: Fri, 6 Jul 2012 21:22:22 -0400 Subject: [PATCH] Update imports and exceptions. --- earwigbot/wiki/copyvios/__init__.py | 16 +++++++++------- earwigbot/wiki/copyvios/search.py | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/earwigbot/wiki/copyvios/__init__.py b/earwigbot/wiki/copyvios/__init__.py index f657f5b..30d4681 100644 --- a/earwigbot/wiki/copyvios/__init__.py +++ b/earwigbot/wiki/copyvios/__init__.py @@ -31,9 +31,9 @@ except ImportError: oauth = None from earwigbot import exceptions -from earwigbot.wiki.copyvios.markov import * -from earwigbot.wiki.copyvios.parsers import * -from earwigbot.wiki.copyvios.search import * +from earwigbot.wiki.copyvios.markov import MarkovChain, MarkovChainIntersection +from earwigbot.wiki.copyvios.parsers import ArticleTextParser, HTMLTextParser +from earwigbot.wiki.copyvios.search import YahooBOSSSearchEngine __all__ = ["CopyvioCheckResult", "CopyvioMixIn"] @@ -107,14 +107,16 @@ class CopyvioMixIn(object): if engine == "Yahoo! BOSS": if not oauth: e = "The package 'oauth2' could not be imported" - raise UnsupportedSearchEngineError(e) + raise exceptions.UnsupportedSearchEngineError(e) return YahooBOSSSearchEngine(credentials) - raise UnknownSearchEngineError(engine) + raise exceptions.UnknownSearchEngineError(engine) def _copyvio_compare_content(self, article, url): - """ - DOCSTRING NEEDED + """Return a number comparing an article and a URL. + + The *article* is a Markov chain, whereas the URL is a string that we + will try to open ourselves. """ html = self._open_url_ignoring_errors(url) if not html: diff --git a/earwigbot/wiki/copyvios/search.py b/earwigbot/wiki/copyvios/search.py index bc9dfe4..d8091ee 100644 --- a/earwigbot/wiki/copyvios/search.py +++ b/earwigbot/wiki/copyvios/search.py @@ -28,7 +28,7 @@ try: except ImportError: oauth = None -from earwigbot.wiki.exceptions import SearchQueryError +from earwigbot.exceptions import SearchQueryError __all__ = ["BaseSearchEngine", "YahooBOSSSearchEngine"]