test: add Python 3.4 compatibility

Steve Canny · Steve Canny · commit 762cd2cd31a5 · 2014-06-22T17:24:19.000-07:00
* remove 3.2 compatibility claim from setup.py
* add 3.4 environment to tox.ini
* add version-dependent mock imports, becomes unittest.mock from 3.3
forward. Put all the imports in tests.unittest and import locally from
there to centralize version-detection logic.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,6 @@
 language: python
 python:
+  - "3.4"
   - "3.3"
   - "2.7"
   - "2.6"
diff --git a/setup.py b/setup.py
@@ -51,8 +51,8 @@ def text_of(relpath):
     'Programming Language :: Python :: 2.6',
     'Programming Language :: Python :: 2.7',
     'Programming Language :: Python :: 3',
-    'Programming Language :: Python :: 3.2',
     'Programming Language :: Python :: 3.3',
+    'Programming Language :: Python :: 3.4',
     'Topic :: Office/Business :: Office Suites',
     'Topic :: Software Development :: Libraries'
 ]
diff --git a/tests/image/test_jpeg.py b/tests/image/test_jpeg.py
@@ -8,8 +8,6 @@
 
 import pytest
 
-from mock import call
-
 from docx.compat import BytesIO
 from docx.image.constants import JPEG_MARKER_CODE, MIME_TYPE
 from docx.image.helpers import BIG_ENDIAN, StreamReader
@@ -20,7 +18,7 @@
 from docx.image.tiff import Tiff
 
 from ..unitutil import (
-    initializer_mock, class_mock, instance_mock, method_mock
+    call, class_mock, initializer_mock, instance_mock, method_mock
 )
 
 
diff --git a/tests/image/test_png.py b/tests/image/test_png.py
@@ -8,8 +8,6 @@
 
 import pytest
 
-from mock import call
-
 from docx.compat import BytesIO
 from docx.image.constants import MIME_TYPE, PNG_CHUNK_TYPE
 from docx.image.exceptions import InvalidImageStreamError
@@ -20,7 +18,8 @@
 )
 
 from ..unitutil import (
-    function_mock, class_mock, initializer_mock, instance_mock, method_mock
+    call, class_mock, function_mock, initializer_mock, instance_mock,
+    method_mock
 )
 
 
diff --git a/tests/image/test_tiff.py b/tests/image/test_tiff.py
@@ -8,8 +8,6 @@
 
 import pytest
 
-from mock import call
-
 from docx.compat import BytesIO
 from docx.image.constants import MIME_TYPE, TIFF_TAG
 from docx.image.helpers import BIG_ENDIAN, LITTLE_ENDIAN, StreamReader
@@ -19,8 +17,8 @@
 )
 
 from ..unitutil import (
-    function_mock, class_mock, initializer_mock, instance_mock, loose_mock,
-    method_mock
+    call, class_mock, function_mock, initializer_mock, instance_mock,
+    loose_mock, method_mock
 )
 
 
diff --git a/tests/opc/test_package.py b/tests/opc/test_package.py
@@ -8,8 +8,6 @@
 
 import pytest
 
-from mock import call, Mock, patch, PropertyMock
-
 from docx.opc.oxml import CT_Relationships
 from docx.opc.packuri import PACKAGE_URI, PackURI
 from docx.opc.package import (
@@ -19,8 +17,8 @@
 from docx.opc.pkgreader import PackageReader
 
 from ..unitutil import (
-    cls_attr_mock, class_mock, function_mock, instance_mock, loose_mock,
-    method_mock
+    call, class_mock, cls_attr_mock, function_mock, instance_mock,
+    loose_mock, method_mock, Mock, patch, PropertyMock
 )
 
 
diff --git a/tests/opc/test_phys_pkg.py b/tests/opc/test_phys_pkg.py
@@ -14,7 +14,6 @@
 import hashlib
 import pytest
 
-from mock import Mock
 from zipfile import ZIP_DEFLATED, ZipFile
 
 from docx.opc.exceptions import PackageNotFoundError
@@ -23,7 +22,7 @@
     _DirPkgReader, PhysPkgReader, PhysPkgWriter, _ZipPkgReader, _ZipPkgWriter
 )
 
-from ..unitutil import absjoin, class_mock, loose_mock, test_file_dir
+from ..unitutil import absjoin, class_mock, loose_mock, Mock, test_file_dir
 
 
 test_docx_path = absjoin(test_file_dir, 'test.docx')
diff --git a/tests/opc/test_pkgreader.py b/tests/opc/test_pkgreader.py
@@ -8,8 +8,6 @@
 
 import pytest
 
-from mock import call, Mock, patch
-
 from docx.opc.constants import (
     CONTENT_TYPE as CT, RELATIONSHIP_TARGET_MODE as RTM
 )
@@ -22,8 +20,8 @@
 
 from .unitdata.types import a_Default, a_Types, an_Override
 from ..unitutil import (
-    initializer_mock, class_mock, function_mock, instance_mock, loose_mock,
-    method_mock
+    call, class_mock, function_mock, initializer_mock, instance_mock,
+    loose_mock, method_mock, Mock, patch
 )
 
 
diff --git a/tests/opc/test_pkgwriter.py b/tests/opc/test_pkgwriter.py
@@ -6,16 +6,16 @@
 
 import pytest
 
-from mock import call, MagicMock, Mock, patch
-
 from docx.opc.constants import CONTENT_TYPE as CT
 from docx.opc.package import Part
 from docx.opc.packuri import PackURI
 from docx.opc.phys_pkg import _ZipPkgWriter
 from docx.opc.pkgwriter import _ContentTypesItem, PackageWriter
 
 from .unitdata.types import a_Default, a_Types, an_Override
-from ..unitutil import class_mock, instance_mock, method_mock
+from ..unitutil import (
+    call, class_mock, instance_mock, MagicMock, method_mock, Mock, patch
+)
 
 
 class DescribePackageWriter(object):
diff --git a/tests/opc/test_rels.py b/tests/opc/test_rels.py
@@ -8,14 +8,14 @@
 
 import pytest
 
-from mock import call, Mock, patch, PropertyMock
-
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.opc.oxml import CT_Relationships
 from docx.opc.package import Part, _Relationship, Relationships
 from docx.opc.packuri import PackURI
 
-from ..unitutil import class_mock, instance_mock, loose_mock
+from ..unitutil import (
+    call, class_mock, instance_mock, loose_mock, Mock, patch, PropertyMock
+)
 
 
 class Describe_Relationship(object):
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
@@ -8,8 +8,6 @@
 
 import pytest
 
-from mock import Mock
-
 from docx.opc.constants import CONTENT_TYPE as CT, RELATIONSHIP_TYPE as RT
 from docx.opc.package import PartFactory
 from docx.opc.packuri import PackURI
@@ -32,7 +30,7 @@
 from ..oxml.unitdata.text import a_p, a_pPr, a_sectPr, an_r
 from ..unitutil import (
     function_mock, class_mock, initializer_mock, instance_mock, loose_mock,
-    method_mock, property_mock
+    method_mock, Mock, property_mock
 )
 
 
diff --git a/tests/test_text.py b/tests/test_text.py
@@ -14,15 +14,13 @@
 
 import pytest
 
-from mock import call, Mock
-
 from .oxml.unitdata.text import (
     a_b, a_bCs, a_br, a_caps, a_cs, a_dstrike, a_p, a_shadow, a_smallCaps,
     a_snapToGrid, a_specVanish, a_strike, a_t, a_u, a_vanish, a_webHidden,
     an_emboss, an_i, an_iCs, an_imprint, an_oMath, a_noProof, an_outline,
     an_r, an_rPr, an_rStyle, an_rtl
 )
-from .unitutil import class_mock, instance_mock
+from .unitutil import call, class_mock, instance_mock, Mock
 
 
 class DescribeParagraph(object):
diff --git a/tests/unitutil.py b/tests/unitutil.py
@@ -5,8 +5,17 @@
 """
 
 import os
+import sys
+
+if sys.version_info >= (3, 3):
+    from unittest import mock  # noqa
+    from unittest.mock import call, MagicMock  # noqa
+    from unittest.mock import create_autospec, Mock, patch, PropertyMock
+else:
+    import mock  # noqa
+    from mock import call, MagicMock  # noqa
+    from mock import create_autospec, Mock, patch, PropertyMock
 
-from mock import create_autospec, Mock, patch, PropertyMock
 
 from docx.oxml.xmlchemy import serialize_for_reading
 
diff --git a/tox.ini b/tox.ini
@@ -8,7 +8,7 @@ python_classes = Test Describe
 python_functions = it_ they_
 
 [tox]
-envlist = py26, py27, py33
+envlist = py26, py27, py33, py34
 
 [testenv]
 deps =
@@ -20,3 +20,15 @@ deps =
 commands =
     py.test -qx
     behave --format progress --stop --tags=-wip
+
+[testenv:py33]
+deps =
+    behave
+    lxml
+    pytest
+
+[testenv:py34]
+deps =
+    behave
+    lxml
+    pytest

-Original file line number
+Diff line change
@@ @@ -1,5 +1,6 @@ @@
 language: python
 python:
 +  - "3.4"
   - "3.3"
   - "2.7"
   - "2.6"
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,6 @@`
`8`	`8`
`9`	`9`	`import pytest`
`10`	`10`
`11`		`-from mock import call`
`12`		`-`
`13`	`11`	`from docx.compat import BytesIO`
`14`	`12`	`from docx.image.constants import MIME_TYPE, PNG_CHUNK_TYPE`
`15`	`13`	`from docx.image.exceptions import InvalidImageStreamError`
`@@ -20,7 +18,8 @@`
`20`	`18`	`)`
`21`	`19`
`22`	`20`	`from ..unitutil import (`
`23`		`- function_mock, class_mock, initializer_mock, instance_mock, method_mock`
	`21`	`+ call, class_mock, function_mock, initializer_mock, instance_mock,`
	`22`	`+ method_mock`
`24`	`23`	`)`
`25`	`24`
`26`	`25`