Use decorator.decorator consistenly in debug wrappers.

 - Legacy-Id: 4936

Author: levkowetz

debug.py

@@ -130,5 +130,8 @@ def wrapper(*args, **kwargs):
         retval = prof.runcall(fn, *args, **kwargs)
         prof.dump_stats(datafn)
         return retval
-    return wrapper
+    if debug:
+        return decorator(wrapper, fn)
+    else:
+        return fn