doc: remove old Document shim object

Author: Steve Canny

docx/__init__.py

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 from docx.api import Document     # noqa
-from docx.api import DocumentNew  # noqa
 
 __version__ = '0.8.1'
 

docx/api.py

@@ -10,12 +10,11 @@
 
 import os
 
-from docx.enum.section import WD_SECTION
 from docx.opc.constants import CONTENT_TYPE as CT
 from docx.package import Package
 
 
-def DocumentNew(docx=None):
+def Document(docx=None):
     """
     Return a |Document| object loaded from *docx*, where *docx* can be
     either a path to a ``.docx`` file (a string) or a file-like object. If
@@ -36,65 +35,3 @@ def _default_docx_path():
     """
     _thisdir = os.path.split(__file__)[0]
     return os.path.join(_thisdir, 'templates', 'default.docx')
-
-
-class Document(object):
-    """
-    Return a |Document| instance loaded from *docx*, where *docx* can be
-    either a path to a ``.docx`` file (a string) or a file-like object. If
-    *docx* is missing or ``None``, the built-in default document "template"
-    is loaded.
-    """
-    def __init__(self, docx=None):
-        self._document = document = DocumentNew(docx)
-        self._document_part = document._part
-        self._package = document._part.package
-
-    def add_heading(self, text='', level=1):
-        return self._document.add_heading(text, level)
-
-    def add_page_break(self):
-        return self._document.add_page_break()
-
-    def add_paragraph(self, text='', style=None):
-        return self._document.add_paragraph(text, style)
-
-    def add_picture(self, image_descriptor, width=None, height=None):
-        return self._document.add_picture(image_descriptor, width, height)
-
-    def add_section(self, start_type=WD_SECTION.NEW_PAGE):
-        return self._document.add_section(start_type)
-
-    def add_table(self, rows, cols, style='Light Shading Accent 1'):
-        return self._document.add_table(rows, cols, style)
-
-    @property
-    def core_properties(self):
-        return self._document.core_properties
-
-    @property
-    def inline_shapes(self):
-        return self._document.inline_shapes
-
-    @property
-    def paragraphs(self):
-        return self._document.paragraphs
-
-    @property
-    def part(self):
-        return self._document.part
-
-    def save(self, path_or_stream):
-        self._document.save(path_or_stream)
-
-    @property
-    def sections(self):
-        return self._document.sections
-
-    @property
-    def styles(self):
-        return self._document.styles
-
-    @property
-    def tables(self):
-        return self._document.tables

features/steps/api.py

@@ -8,7 +8,7 @@
 
 import docx
 
-from docx import DocumentNew
+from docx import Document
 
 from helpers import test_docx
 
@@ -24,12 +24,12 @@ def given_I_have_python_docx_installed(context):
 
 @when('I call docx.Document() with no arguments')
 def when_I_call_docx_Document_with_no_arguments(context):
-    context.document = DocumentNew()
+    context.document = Document()
 
 
 @when('I call docx.Document() with the path of a .docx file')
 def when_I_call_docx_Document_with_the_path_of_a_docx_file(context):
-    context.document = DocumentNew(test_docx('doc-default'))
+    context.document = Document(test_docx('doc-default'))
 
 
 # then =====================================================

features/steps/shape.py

@@ -128,7 +128,7 @@ def then_the_document_contains_the_inline_picture(context):
     picture_shape = document.inline_shapes[0]
     blip = picture_shape._inline.graphic.graphicData.pic.blipFill.blip
     rId = blip.embed
-    image_part = document._document_part.related_parts[rId]
+    image_part = document.part.related_parts[rId]
     image_sha1 = hashlib.sha1(image_part.blob).hexdigest()
     expected_sha1 = '79769f1e202add2e963158b532e36c2c0f76a70c'
     assert image_sha1 == expected_sha1, (

tests/test_api.py

@@ -12,7 +12,7 @@
 
 import docx
 
-from docx.api import Document, DocumentNew
+from docx.api import Document
 from docx.opc.constants import CONTENT_TYPE as CT
 
 from .unitutil.mock import function_mock, instance_mock, class_mock
@@ -22,13 +22,13 @@ class DescribeDocument(object):
 
     def it_opens_a_docx_file(self, open_fixture):
         docx, Package_, document_ = open_fixture
-        document = DocumentNew(docx)
+        document = Document(docx)
         Package_.open.assert_called_once_with(docx)
         assert document is document_
 
     def it_opens_the_default_docx_if_none_specified(self, default_fixture):
         docx, Package_, document_ = default_fixture
-        document = DocumentNew()
+        document = Document()
         Package_.open.assert_called_once_with(docx)
         assert document is document_