jenkins-bot has submitted this change and it was merged.

Change subject: Move pywikibot/data/logentries.py to pywikibot/logentries.py ......................................................................

Move pywikibot/data/logentries.py to pywikibot/logentries.py

logentries.py makes no sense in the data folder since it is just a container for already fetched data.

Change-Id: Ic8948f7115f468a6fbe521721a7b3677695e6539 --- M pywikibot/data/api.py R pywikibot/logentries.py M tests/site_tests.py 3 files changed, 6 insertions(+), 6 deletions(-)

Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified

diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index 237d433..c439eb2 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -857,7 +857,7 @@ def __init__(self, logtype=None, **kwargs): ListGenerator.__init__(self, "logevents", **kwargs)

- import logentries + from pywikibot import logentries self.entryFactory = logentries.LogEntryFactory(logtype)

def result(self, pagedata): diff --git a/pywikibot/data/logentries.py b/pywikibot/logentries.py similarity index 100% rename from pywikibot/data/logentries.py rename to pywikibot/logentries.py diff --git a/tests/site_tests.py b/tests/site_tests.py index cb29a0e..b45cf0c 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -549,7 +549,7 @@

le = list(mysite.logevents(total=10)) self.assertTrue(len(le) <= 10) - self.assertTrue(all(isinstance(entry, pywikibot.data.logentries.LogEntry) + self.assertTrue(all(isinstance(entry, pywikibot.logentries.LogEntry) for entry in le)) for typ in ("block", "protect", "rights", "delete", "upload", "move", "import", "patrol", "merge"): @@ -560,21 +560,21 @@ for entry in mysite.logevents(user=mysite.user(), total=3): self.assertTrue(entry.user() == mysite.user()) for entry in mysite.logevents(start="2008-09-01T00:00:01Z", total=5): - self.assertType(entry, pywikibot.data.logentries.LogEntry) + self.assertType(entry, pywikibot.logentries.LogEntry) self.assertTrue(str(entry.timestamp()) <= "2008-09-01T00:00:01Z") for entry in mysite.logevents(end="2008-09-02T23:59:59Z", total=5): - self.assertType(entry, pywikibot.data.logentries.LogEntry) + self.assertType(entry, pywikibot.logentries.LogEntry) self.assertTrue(str(entry.timestamp()) >= "2008-09-02T23:59:59Z") for entry in mysite.logevents(start="2008-02-02T00:00:01Z", end="2008-02-02T23:59:59Z", reverse=True, total=5): - self.assertType(entry, pywikibot.data.logentries.LogEntry) + self.assertType(entry, pywikibot.logentries.LogEntry) self.assertTrue("2008-02-02T00:00:01Z" <= str(entry.timestamp()) <= "2008-02-02T23:59:59Z") for entry in mysite.logevents(start="2008-02-03T23:59:59Z", end="2008-02-03T00:00:01Z", total=5): - self.assertType(entry, pywikibot.data.logentries.LogEntry) + self.assertType(entry, pywikibot.logentries.LogEntry) self.assertTrue("2008-02-03T00:00:01Z" <= str(entry.timestamp()) <= "2008-02-03T23:59:59Z") # starttime earlier than endtime