diff options
| author | Michael E Brown <mebrown@michaels-house.net> | 2007-12-03 13:31:42 -0600 |
|---|---|---|
| committer | Michael E Brown <mebrown@michaels-house.net> | 2007-12-03 13:31:42 -0600 |
| commit | 496d70fedd0f62413b69577e538ec801f343de6e (patch) | |
| tree | 60434ba2bd4534729d6ec0d95f871282fae79e91 | |
| parent | aed81342043efd1b342b660aac812af1913af171 (diff) | |
| download | mock-496d70fedd0f62413b69577e538ec801f343de6e.tar.gz mock-496d70fedd0f62413b69577e538ec801f343de6e.tar.xz mock-496d70fedd0f62413b69577e538ec801f343de6e.zip | |
consolidate imports.
| -rw-r--r-- | py/mock/backend.py | 3 | ||||
| -rwxr-xr-x | py/mock/trace_decorator.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/py/mock/backend.py b/py/mock/backend.py index 9ceace6..0576b1f 100644 --- a/py/mock/backend.py +++ b/py/mock/backend.py @@ -13,12 +13,11 @@ import logging import os import shutil import stat -from peak.util.decorators import decorate # our imports import mock.util import mock.exception -from mock.trace_decorator import traceLog +from mock.trace_decorator import traceLog, decorate # set up logging moduleLog = logging.getLogger("mock") diff --git a/py/mock/trace_decorator.py b/py/mock/trace_decorator.py index 7ce0806..0c677a4 100755 --- a/py/mock/trace_decorator.py +++ b/py/mock/trace_decorator.py @@ -6,7 +6,7 @@ import logging import os import sys -from peak.util.decorators import rewrap +from peak.util.decorators import rewrap, decorate moduleLog = logging.getLogger("mock.trace_decorator") |