need to use SQLA's approach of calling mock from unittest for py3k

diff --git a/tests/__init__.py b/tests/__init__.py
index 2fb34da3cde5edcc202e3c9e526c11449b85d27b..d6f686ca16070eccf0adce769edbbcd729c675a2 100644 (file)
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -14,7 +14,7 @@ from sqlalchemy.util import decorator
 
 import alembic
 from alembic import util
-from alembic.compat import string_types, text_type, u
+from alembic.compat import string_types, text_type, u, py33
 from alembic.migration import MigrationContext
 from alembic.environment import EnvironmentContext
 from alembic.operations import Operations
@@ -27,6 +27,17 @@ files_directory = os.path.join(os.path.dirname(__file__), 'files')
 testing_config = configparser.ConfigParser()
 testing_config.read(['test.cfg'])
 
+if py33:
+    from unittest.mock import Mock, call
+else:
+    try:
+        from mock import Mock, call
+    except ImportError:
+        raise ImportError(
+                "Alembic's test suite requires the "
+                "'mock' library as of 0.6.1.")
+
+
 def sqlite_db():
     # sqlite caches table pragma info
     # per connection, so create a new

diff --git a/tests/test_config.py b/tests/test_config.py
index 3f7862ce358f827f4f47725def611a4c0a9d7178..6164eb901fc1af572c4237b5f6e7bf950ec39e89 100644 (file)
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -5,7 +5,7 @@ from alembic.migration import MigrationContext
 from alembic.operations import Operations
 from alembic.script import ScriptDirectory
 import unittest
-from mock import Mock, call
+from . import Mock, call
 
 from . import eq_, capture_db, assert_raises_message