sect: migrate Sections to docx.section

Steve Canny · Steve Canny · commit 64e1360df0e2 · 2015-02-15T03:14:48.000-08:00
diff --git a/docx/parts/document.py b/docx/parts/document.py
@@ -8,14 +8,12 @@
     absolute_import, division, print_function, unicode_literals
 )
 
-from collections import Sequence
-
 from ..blkcntnr import BlockItemContainer
 from ..document import Document
 from .numbering import NumberingPart
 from ..opc.constants import RELATIONSHIP_TYPE as RT
 from ..opc.part import XmlPart
-from ..section import Section
+from ..section import Sections
 from ..shape import InlineShape
 from ..shared import lazyproperty, Parented
 from .styles import StylesPart
@@ -221,27 +219,3 @@ def _inline_lst(self):
         body = self._body
         xpath = '//w:p/w:r/w:drawing/wp:inline'
         return body.xpath(xpath)
-
-
-class Sections(Sequence):
-    """
-    Sequence of |Section| objects corresponding to the sections in the
-    document. Supports ``len()``, iteration, and indexed access.
-    """
-    def __init__(self, document_elm):
-        super(Sections, self).__init__()
-        self._document_elm = document_elm
-
-    def __getitem__(self, key):
-        if isinstance(key, slice):
-            sectPr_lst = self._document_elm.sectPr_lst[key]
-            return [Section(sectPr) for sectPr in sectPr_lst]
-        sectPr = self._document_elm.sectPr_lst[key]
-        return Section(sectPr)
-
-    def __iter__(self):
-        for sectPr in self._document_elm.sectPr_lst:
-            yield Section(sectPr)
-
-    def __len__(self):
-        return len(self._document_elm.sectPr_lst)
diff --git a/docx/section.py b/docx/section.py
@@ -6,6 +6,32 @@
 
 from __future__ import absolute_import, print_function, unicode_literals
 
+from collections import Sequence
+
+
+class Sections(Sequence):
+    """
+    Sequence of |Section| objects corresponding to the sections in the
+    document. Supports ``len()``, iteration, and indexed access.
+    """
+    def __init__(self, document_elm):
+        super(Sections, self).__init__()
+        self._document_elm = document_elm
+
+    def __getitem__(self, key):
+        if isinstance(key, slice):
+            sectPr_lst = self._document_elm.sectPr_lst[key]
+            return [Section(sectPr) for sectPr in sectPr_lst]
+        sectPr = self._document_elm.sectPr_lst[key]
+        return Section(sectPr)
+
+    def __iter__(self):
+        for sectPr in self._document_elm.sectPr_lst:
+            yield Section(sectPr)
+
+    def __len__(self):
+        return len(self._document_elm.sectPr_lst)
+
 
 class Section(object):
     """
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
@@ -13,11 +13,10 @@
 from docx.oxml.parts.document import CT_Body
 from docx.oxml.text.run import CT_R
 from docx.package import ImageParts, Package
-from docx.parts.document import _Body, DocumentPart, InlineShapes, Sections
+from docx.parts.document import _Body, DocumentPart, InlineShapes
 from docx.parts.image import ImagePart
 from docx.parts.numbering import NumberingPart
 from docx.parts.styles import StylesPart
-from docx.section import Section
 from docx.shape import InlineShape
 from docx.styles.style import BaseStyle
 from docx.styles.styles import Styles
@@ -579,47 +578,3 @@ def rId_(self, request):
     @pytest.fixture
     def shape_id_(self, request):
         return instance_mock(request, int)
-
-
-class DescribeSections(object):
-
-    def it_knows_how_many_sections_it_contains(self, len_fixture):
-        sections, expected_len = len_fixture
-        assert len(sections) == expected_len
-
-    def it_can_iterate_over_its_Section_instances(self, iter_fixture):
-        sections, expected_count = iter_fixture
-        section_count = 0
-        for section in sections:
-            section_count += 1
-            assert isinstance(section, Section)
-        assert section_count == expected_count
-
-    def it_can_access_its_Section_instances_by_index(self, index_fixture):
-        sections, indicies = index_fixture
-        assert len(sections[0:2]) == 2
-        for index in indicies:
-            assert isinstance(sections[index], Section)
-
-    # fixtures -------------------------------------------------------
-
-    @pytest.fixture
-    def index_fixture(self, document_elm):
-        sections = Sections(document_elm)
-        return sections, [0, 1]
-
-    @pytest.fixture
-    def iter_fixture(self, document_elm):
-        sections = Sections(document_elm)
-        return sections, 2
-
-    @pytest.fixture
-    def len_fixture(self, document_elm):
-        sections = Sections(document_elm)
-        return sections, 2
-
-    # fixture components ---------------------------------------------
-
-    @pytest.fixture
-    def document_elm(self):
-        return element('w:document/w:body/(w:p/w:pPr/w:sectPr, w:sectPr)')
diff --git a/tests/test_section.py b/tests/test_section.py
@@ -9,12 +9,56 @@
 import pytest
 
 from docx.enum.section import WD_ORIENT, WD_SECTION
-from docx.section import Section
+from docx.section import Section, Sections
 from docx.shared import Inches
 
 from .unitutil.cxml import element, xml
 
 
+class DescribeSections(object):
+
+    def it_knows_how_many_sections_it_contains(self, len_fixture):
+        sections, expected_len = len_fixture
+        assert len(sections) == expected_len
+
+    def it_can_iterate_over_its_Section_instances(self, iter_fixture):
+        sections, expected_count = iter_fixture
+        section_count = 0
+        for section in sections:
+            section_count += 1
+            assert isinstance(section, Section)
+        assert section_count == expected_count
+
+    def it_can_access_its_Section_instances_by_index(self, index_fixture):
+        sections, indicies = index_fixture
+        assert len(sections[0:2]) == 2
+        for index in indicies:
+            assert isinstance(sections[index], Section)
+
+    # fixtures -------------------------------------------------------
+
+    @pytest.fixture
+    def index_fixture(self, document_elm):
+        sections = Sections(document_elm)
+        return sections, [0, 1]
+
+    @pytest.fixture
+    def iter_fixture(self, document_elm):
+        sections = Sections(document_elm)
+        return sections, 2
+
+    @pytest.fixture
+    def len_fixture(self, document_elm):
+        sections = Sections(document_elm)
+        return sections, 2
+
+    # fixture components ---------------------------------------------
+
+    @pytest.fixture
+    def document_elm(self):
+        return element('w:document/w:body/(w:p/w:pPr/w:sectPr, w:sectPr)')
+
+
 class DescribeSection(object):
 
     def it_knows_its_start_type(self, start_type_get_fixture):
