diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-04-28 18:16:30 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-04-28 18:16:30 -0400 |
| commit | 6d0a8b09bae6f870d0b09232d0c2daf836c68bbd (patch) | |
| tree | 7143e3fbf827f9c5e880be222194d319e98a143c /test | |
| parent | 2858e56a21297351a1949dcb9793f9d18a78b638 (diff) | |
| download | external_python_mako-6d0a8b09bae6f870d0b09232d0c2daf836c68bbd.tar.gz external_python_mako-6d0a8b09bae6f870d0b09232d0c2daf836c68bbd.tar.bz2 external_python_mako-6d0a8b09bae6f870d0b09232d0c2daf836c68bbd.zip | |
- use py3.3's unittest.mock if available
Diffstat (limited to 'test')
| -rw-r--r-- | test/__init__.py | 7 | ||||
| -rw-r--r-- | test/test_cmd.py | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/test/__init__.py b/test/__init__.py index cf5f36a..46f9f81 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -1,7 +1,7 @@ from mako.template import Template import unittest import os -from mako.compat import py3k, py26 +from mako.compat import py3k, py26, py33 from mako import compat from mako.util import update_wrapper import re @@ -62,6 +62,11 @@ def teardown(): import shutil shutil.rmtree(module_base, True) +if py33: + from unittest import mock +else: + import mock + @contextlib.contextmanager def raises(except_cls, message=None): try: diff --git a/test/test_cmd.py b/test/test_cmd.py index d7e07ae..a2adbf9 100644 --- a/test/test_cmd.py +++ b/test/test_cmd.py @@ -1,8 +1,7 @@ from __future__ import with_statement from contextlib import contextmanager -from test import TemplateTest, eq_, raises, template_base +from test import TemplateTest, eq_, raises, template_base, mock import os -import mock from mako.cmd import cmdline class CmdTest(TemplateTest): |