- use compat version of mock for py3

diff --git a/tests/__init__.py b/tests/__init__.py
index 9bb5ef6bd460ddb1215e1a744a0a47bc72aded72..cd721ae4a4a0b289dc27c07e2871b35e6715f42e 100644 (file)
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -29,9 +29,11 @@ testing_config.read(['test.cfg'])
 
 if py33:
     from unittest.mock import Mock, call
+    from unittest import mock
 else:
     try:
         from mock import Mock, call
+        import mock
     except ImportError:
         raise ImportError(
                 "Alembic's test suite requires the "

diff --git a/tests/test_op.py b/tests/test_op.py
index 1b82af30e3ed40e0f4c70981d662fb95203ba484..277f184569420dfdbaa4dcc9ce9f06930042e245 100644 (file)
--- a/tests/test_op.py
+++ b/tests/test_op.py
@@ -7,7 +7,7 @@ from sqlalchemy import event
 
 from alembic import op
 from . import op_fixture, assert_raises_message, requires_094, eq_
-import mock
+from . import mock
 
 @event.listens_for(Table, "after_parent_attach")
 def _add_cols(table, metadata):