From f4c33d86fbb0b18a62696153e7b52e1b1532c86f Mon Sep 17 00:00:00 2001 From: Ben Kurtovic Date: Tue, 3 Jul 2012 18:22:29 -0400 Subject: [PATCH] Mixin -> MixIn --- docs/toolset.rst | 6 +++--- earwigbot/exceptions.py | 16 ++++++++-------- earwigbot/wiki/page.py | 8 ++++---- earwigbot/wiki/site.py | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/toolset.rst b/docs/toolset.rst index b8a4124..a1db42b 100644 --- a/docs/toolset.rst +++ b/docs/toolset.rst @@ -153,11 +153,11 @@ and the following methods: `: adds a new section named ``title`` at the bottom of the page - :py:meth:`copyvio_check(...) - `: checks the page for + `: checks the page for copyright violations - :py:meth:`copyvio_compare(url, ...) - `: checks the page like - :py:meth:`~earwigbot.wiki.copyvios.CopyvioMixin.copyvio_check`, but + `: checks the page like + :py:meth:`~earwigbot.wiki.copyvios.CopyvioMixIn.copyvio_check`, but against a specific URL Additionally, :py:class:`~earwigbot.wiki.category.Category` objects (created diff --git a/earwigbot/exceptions.py b/earwigbot/exceptions.py index 335f6ff..b06354a 100644 --- a/earwigbot/exceptions.py +++ b/earwigbot/exceptions.py @@ -201,9 +201,9 @@ class CopyvioCheckError(WikiToolsetError): raised instead of this. Raised by :py:meth:`Page.copyvio_check - ` and + ` and :py:meth:`Page.copyvio_compare - `. + `. """ class UnknownSearchEngineError(CopyvioCheckError): @@ -213,9 +213,9 @@ class UnknownSearchEngineError(CopyvioCheckError): :py:attr:`config.wiki["search"]["engine"]`. Raised by :py:meth:`Page.copyvio_check - ` and + ` and :py:meth:`Page.copyvio_compare - `. + `. """ class UnsupportedSearchEngineError(CopyvioCheckError): @@ -225,16 +225,16 @@ class UnsupportedSearchEngineError(CopyvioCheckError): couldn't be imported. Raised by :py:meth:`Page.copyvio_check - ` and + ` and :py:meth:`Page.copyvio_compare - `. + `. """ class SearchQueryError(CopyvioCheckError): """Some error ocurred while doing a search query. Raised by :py:meth:`Page.copyvio_check - ` and + ` and :py:meth:`Page.copyvio_compare - `. + `. """ diff --git a/earwigbot/wiki/page.py b/earwigbot/wiki/page.py index bbafc0b..ab18952 100644 --- a/earwigbot/wiki/page.py +++ b/earwigbot/wiki/page.py @@ -31,11 +31,11 @@ except ImportError: mwparserfromhell = None from earwigbot import exceptions -from earwigbot.wiki.copyright import CopyrightMixin +from earwigbot.wiki.copyright import CopyrightMixIn __all__ = ["Page"] -class Page(CopyrightMixin): +class Page(CopyrightMixIn): """ **EarwigBot: Wiki Toolset: Page** @@ -69,9 +69,9 @@ class Page(CopyrightMixin): - :py:meth:`edit`: replaces the page's content or creates a new page - :py:meth:`add_section`: adds a new section at the bottom of the page - - :py:meth:`~earwigbot.wiki.copyvios.CopyrightMixin.copyvio_check`: + - :py:meth:`~earwigbot.wiki.copyvios.CopyrightMixIn.copyvio_check`: checks the page for copyright violations - - :py:meth:`~earwigbot.wiki.copyvios.CopyrightMixin.copyvio_compare`: + - :py:meth:`~earwigbot.wiki.copyvios.CopyrightMixIn.copyvio_compare`: checks the page like :py:meth:`copyvio_check`, but against a specific URL """ diff --git a/earwigbot/wiki/site.py b/earwigbot/wiki/site.py index 76033fd..4ec5beb 100644 --- a/earwigbot/wiki/site.py +++ b/earwigbot/wiki/site.py @@ -129,7 +129,7 @@ class Site(object): self._sql_conn = None self._sql_lock = Lock() - # Attribute used in copyright violation checks (see CopyrightMixin): + # Attribute used in copyright violation checks (see CopyrightMixIn): self._search_config = search_config # Set up cookiejar and URL opener for making API queries: