api: Document raises on not .docx

Steve Canny · Steve Canny · commit 02529905fa45 · 2013-12-20T20:10:43.000-08:00
docx.api.Document should raise on construction if supplied file is not
a Word .docx file.
diff --git a/docx/api.py b/docx/api.py
@@ -16,6 +16,7 @@
 import os
 
 from opc import OpcPackage
+from opc.constants import CONTENT_TYPE as CT
 
 
 thisdir = os.path.split(__file__)[0]
@@ -33,6 +34,9 @@ def Document(docx=None):
         docx = _default_docx_path
     pkg = OpcPackage.open(docx)
     document_part = pkg.main_document
+    if document_part.content_type != CT.WML_DOCUMENT_MAIN:
+        tmpl = "file '%s' is not a Word file, content type is '%s'"
+        raise ValueError(tmpl % (docx, document_part.content_type))
     return _Document(pkg, document_part)
 
 
diff --git a/tests/test_api.py b/tests/test_api.py
@@ -14,6 +14,7 @@
 from mock import Mock, PropertyMock
 
 from docx.api import Document, _Document
+from opc.constants import CONTENT_TYPE as CT
 
 from .unitutil import class_mock, var_mock
 
@@ -37,6 +38,7 @@ def OpcPackage_mockery(self, request):
         OpcPackage_ = class_mock('docx.api.OpcPackage', request)
         pkg = OpcPackage_.open.return_value
         main_document = PropertyMock(name='main_document')
+        main_document.return_value.content_type = CT.WML_DOCUMENT_MAIN
         type(pkg).main_document = main_document
         document_part = main_document.return_value
         return (OpcPackage_, pkg, main_document, document_part)
@@ -58,3 +60,12 @@ def it_uses_default_if_no_file_provided(self, OpcPackage_, _Document_,
                                             default_docx):
         Document()
         OpcPackage_.open.assert_called_once_with(default_docx)
+
+    def it_should_raise_if_not_a_docx_file(self, OpcPackage_mockery):
+        # mockery ----------------------
+        docx = Mock(name='docx')
+        OpcPackage_, pkg, main_document, document_part = OpcPackage_mockery
+        main_document.return_value.content_type = 'foobar'
+        # verify -----------------------
+        with pytest.raises(ValueError):
+            Document(docx)
