Move decorator import in debug.py closer to actual usage points so the

decorator library is not imported unless needed - it doesn't appear to
be part of Python 2.7 so needs to be installed separately
 - Legacy-Id: 6765

Author: OleLaursen

debug.py

@@ -24,8 +24,6 @@
 except ImportError:
     debug = True
 
-from decorator import decorator
-
 # A debug decorator, written by Paul Butler, taken from
 # http://paulbutler.org/archives/python-debugging-with-decorators/
 # Additional functions and decorator functionality added by
@@ -78,6 +76,7 @@ def wrap(fn, *params,**kwargs):
         return ret
     wrap.callcount = 0
     if debug:
+        from decorator import decorator
         return decorator(wrap, fn)
     else:
         return fn
@@ -109,6 +108,7 @@ def wrap(fn, *params,**kwargs):
         return ret
     wrap.callcount = 0
     if debug:
+        from decorator import decorator
         return decorator(wrap, fn)
     else:
         return fn
@@ -169,6 +169,7 @@ def wrapper(*args, **kwargs):
         prof.dump_stats(datafn)
         return retval
     if debug:
+        from decorator import decorator
         return decorator(wrapper, fn)
     else:
         return fn