consolidate imports.mock-0.8.12

3 files changed, 3 insertions, 6 deletions

diff --git a/py/mock.py b/py/mock.py
index bb5df8c..cb558e0 100755
--- a/py/mock.py
+++ b/py/mock.py
@@ -37,7 +37,6 @@ import os.path
 import sys
 import time
 from optparse import OptionParser
-from peak.util.decorators import decorate
 
 # all of the variables below are substituted by the build system
 __VERSION__ = "unreleased_version"
@@ -57,7 +56,7 @@ log = logging.getLogger()
 
 # our imports
 import mock.exception
-from mock.trace_decorator import traceLog
+from mock.trace_decorator import traceLog, decorate
 import mock.backend
 import mock.uid
 import mock.util
diff --git a/py/mock/uid.py b/py/mock/uid.py
index a9aca11..0d12935 100644
--- a/py/mock/uid.py
+++ b/py/mock/uid.py
@@ -6,10 +6,9 @@
 # python library imports
 import logging
 import os
-from peak.util.decorators import decorate
 
 # our imports
-from mock.trace_decorator import traceLog
+from mock.trace_decorator import traceLog, decorate
 
 # set up logging
 log = logging.getLogger("mock.uid")
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")