diff options
author | Michael E Brown <mebrown@michaels-house.net> | 2007-12-03 13:33:13 -0600 |
---|---|---|
committer | Michael E Brown <mebrown@michaels-house.net> | 2007-12-03 13:33:13 -0600 |
commit | fe9f23d9f01166ec6181d768f0489f8c358403b0 (patch) | |
tree | 1701c7f3fda95253949740ae7e4f8b2c71be3aa0 | |
parent | 496d70fedd0f62413b69577e538ec801f343de6e (diff) | |
download | mock-fe9f23d9f01166ec6181d768f0489f8c358403b0.tar.gz mock-fe9f23d9f01166ec6181d768f0489f8c358403b0.tar.xz mock-fe9f23d9f01166ec6181d768f0489f8c358403b0.zip |
consolidate imports.mock-0.8.12
-rwxr-xr-x | py/mock.py | 3 | ||||
-rw-r--r-- | py/mock/uid.py | 3 | ||||
-rw-r--r-- | py/mock/util.py | 3 |
3 files changed, 3 insertions, 6 deletions
@@ -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") |