From c64946f49a848356c0855392d359912fab3e0de2 Mon Sep 17 00:00:00 2001 From: Quantum Date: Sun, 13 Aug 2017 19:50:47 -0400 Subject: [PATCH] Make imports more usable. --- optimize_later/__init__.py | 5 +++++ optimize_later/core.py | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/optimize_later/__init__.py b/optimize_later/__init__.py index 91a8f69..bc55a2b 100644 --- a/optimize_later/__init__.py +++ b/optimize_later/__init__.py @@ -1,2 +1,7 @@ +from optimize_later.config import register_callback, deregister_callback, optimize_context +from optimize_later.core import optimize_later + +__all__ = ['register_callback', 'deregister_callback', 'optimize_context', 'optimize_later'] + # Make this usable as a Django application. default_app_config = 'optimize_later.apps.OptimizeLaterConfig' diff --git a/optimize_later/core.py b/optimize_later/core.py index 23a59fe..1c2cc31 100644 --- a/optimize_later/core.py +++ b/optimize_later/core.py @@ -8,6 +8,7 @@ from numbers import Number from optimize_later.config import global_callback from optimize_later.utils import NoArgDecoratorMeta, with_metaclass +from optimize_later import utils log = logging.getLogger(__name__.rpartition('.')[0] or __name__) timer = [time.time, time.clock][os.name == 'nt'] @@ -16,7 +17,7 @@ timer = [time.time, time.clock][os.name == 'nt'] def _generate_default_name(): for entry in inspect.stack(): file, line = entry[1:3] - if file != __file__: + if file not in (__file__, utils.__file__): break else: return '-'