Merged in branch/iola/shimfree@6856. This pretty much completes the shim removal. Next step is upgrading Django to 1.6, and then doing some final polishing.

 - Legacy-Id: 6966

Author: levkowetz

bin/mkdiagram

@@ -9,7 +9,7 @@ trap 'echo "$program($LINENO): Command failed with error code $? ($0 $*)"; exit
 if [ "$*" ]; then apps="$@"; graph="${1%.*}"; else apps=$(ls */models.py | sed 's!/models.py!!'); graph="models"; fi
 
 newapps="doc group meeting message person name"
-legacyapps="announcements idindex idrfc idtracker iesg ietfauth ietfworkflows ipr liaisons mailinglists proceedings redirects submit wgchairs wgcharter wginfo"
+legacyapps="announcements idindex idrfc idtracker iesg ietfauth ipr liaisons mailinglists proceedings redirects submit wgcharter wginfo"
 
 proxy="$(grep ^class */proxy.py | tr '()' '  ' | awk '{printf $2 ","}')"
 names="$(grep ^class name/models.py | tr '()' '  ' | awk '{printf $2 ","}')"

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