- use py3.3's unittest.mock if available
diff --git a/mako/compat.py b/mako/compat.py
index dea1b30..e26b65b 100644
--- a/mako/compat.py
+++ b/mako/compat.py
@@ -99,6 +99,7 @@
return func(*(args + fargs), **newkeywords)
return newfunc
+
all = all
import json
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 @@
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):
