Move to Python 3.3+ mock import

Author: nateprewitt

tests/__init__.py

@@ -19,13 +19,7 @@
 
 
 import unittest
-
-
-# Python 3 includes mocking, while 2 requires an extra module.
-if sys.version_info[0] == 2:
-    import mock
-else:
-    from unittest import mock
+from unittest import mock
 
 
 # In python 3, order matters when calling assertEqual to

tests/unit/docs/test_docstring.py

@@ -10,10 +10,10 @@
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
-import mock
 from botocore.compat import six
 
 from tests.unit.docs import BaseDocsTest
+from tests import mock
 
 
 class TestResourceDocstrings(BaseDocsTest):

tests/unit/docs/test_service.py

@@ -11,9 +11,9 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 import os
-import mock
 
 import boto3
+from tests import mock
 from tests.unit.docs import BaseDocsTest
 from boto3.docs.service import ServiceDocumenter
 

tests/unit/ec2/test_createtags.py

@@ -10,8 +10,7 @@
 # distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
-from tests import unittest
-import mock
+from tests import mock, unittest
 
 import boto3.session
 from boto3.ec2 import createtags

tests/unit/ec2/test_deletetags.py

@@ -10,8 +10,7 @@
 # distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
-import unittest
-import mock
+from tests import mock, unittest
 
 from boto3.ec2.deletetags import delete_tags
 

tests/unit/s3/test_inject.py

@@ -10,13 +10,11 @@
 # distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
-import mock
-
 from botocore.exceptions import ClientError
 from botocore.compat import six
 
 from boto3.s3 import inject
-from tests import unittest
+from tests import mock, unittest
 
 
 class TestInjectTransferMethods(unittest.TestCase):

tests/unit/s3/test_transfer.py

@@ -10,9 +10,8 @@
 # distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
-from tests import unittest
+from tests import mock, unittest
 
-import mock
 from s3transfer.manager import TransferManager
 from s3transfer.futures import NonThreadedExecutor
 

tests/unit/test_utils.py

@@ -11,8 +11,7 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 import types
-from tests import unittest
-import mock
+from tests import mock, unittest
 
 from boto3 import utils