Merge branch 'makoshark-remove_revisions_from_slot'

Author: halfak

mw/xml_dump/iteration/page.py

@@ -1,9 +1,8 @@
 from ...types import serializable
 from ...util import none_or
-
 from ..errors import MalformedXML
-from .revision import Revision
 from .redirect import Redirect
+from .revision import Revision
 
 
 class Page(serializable.Type):
@@ -24,11 +23,10 @@ class Page(serializable.Type):
         'title',
         'namespace',
         'redirect',
-        'restrictions',
-        'revisions'
+        'restrictions'
     )
 
-    def __init__(self, id, title, namespace, redirect, restrictions, revisions):
+    def __init__(self, id, title, namespace, redirect, restrictions, revisions=None):
         self.id = none_or(id, int)
         """
         Page ID : `int`
@@ -55,7 +53,7 @@ def __init__(self, id, title, namespace, redirect, restrictions, revisions):
         """
 
         # Should be a lazy generator
-        self.__revisions = revisions
+        self.__revisions = revisions or []
 
     def __iter__(self):
         return self.__revisions

mw/xml_dump/iteration/tests/test_iterator.py

@@ -6,6 +6,8 @@
 from ..iterator import Iterator
 from ..comment import Comment
 from ..text import Text
+from ..revision import Revision
+from ..page import Page
 
 
 SAMPLE_XML = """
@@ -119,13 +121,15 @@ def test_complete():
     eq_(revision.beginningofpage, False)
 
     page = next(dump)
+    assert_is_instance(page, Page)
     eq_(page.title, "Bar")
     eq_(page.namespace, 1)
     eq_(page.id, 2)
     eq_(page.redirect.title, "Computer accessibility")
     eq_(page.restrictions, ["edit=sysop:move=sysop"])
 
     revision = next(page)
+    assert_is_instance(revision, Revision)
     eq_(revision.id, 3)
     eq_(revision.timestamp, Timestamp("2004-08-11T09:04:08Z"))
     eq_(revision.contributor.id, None)
@@ -136,8 +140,10 @@ def test_complete():
     eq_(revision.comment, None)
     eq_(revision.model, "wikitext")
     eq_(revision.format, "text/x-wiki")
+    assert_is_instance(str(page), str)
 
     revision = next(page)
+    assert_is_instance(revision, Revision)
     eq_(revision.id, 4)
     eq_(revision.timestamp, Timestamp("2004-08-12T09:04:08Z"))
     eq_(revision.contributor, None)
@@ -147,6 +153,7 @@ def test_complete():
     eq_(revision.comment, None)
     eq_(revision.model, "wikitext")
     eq_(revision.format, "text/x-wiki")
+    assert_is_instance(str(revision), str)
 
 
 def test_skipping():