summaryrefslogtreecommitdiffstats
path: root/py/mock/util.py
diff options
context:
space:
mode:
authorMichael E Brown <mebrown@michaels-house.net>2007-12-03 13:33:13 -0600
committerMichael E Brown <mebrown@michaels-house.net>2007-12-03 13:33:13 -0600
commitfe9f23d9f01166ec6181d768f0489f8c358403b0 (patch)
tree1701c7f3fda95253949740ae7e4f8b2c71be3aa0 /py/mock/util.py
parent496d70fedd0f62413b69577e538ec801f343de6e (diff)
downloadmock-fe9f23d9f01166ec6181d768f0489f8c358403b0.tar.gz
mock-fe9f23d9f01166ec6181d768f0489f8c358403b0.tar.xz
mock-fe9f23d9f01166ec6181d768f0489f8c358403b0.zip
consolidate imports.mock-0.8.12
Diffstat (limited to 'py/mock/util.py')
-rw-r--r--py/mock/util.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/py/mock/util.py b/py/mock/util.py
index b54e5f3..32bbc7e 100644
--- a/py/mock/util.py
+++ b/py/mock/util.py
@@ -16,11 +16,10 @@ import rpmUtils.transaction
import shutil
import signal
import time
-from peak.util.decorators import decorate
# our imports
import mock.exception
-from mock.trace_decorator import traceLog
+from mock.trace_decorator import traceLog, decorate
# set up logging
log = logging.getLogger("mock.util")