daklib/extensions.py, dak/dak.py, config/debian/extensions.py: move

[dak.git] / config / debian / extensions.py

diff --git a/config/debian/extensions.py b/config/debian/extensions.py
index d586d4d0014f50d17707685681a9cc6cb30757f0..9d6bef1c4c98674bda6b5fb9f865979465f91381 100644 (file)
--- a/config/debian/extensions.py
+++ b/config/debian/extensions.py
@@ -1,21 +1,7 @@
 import sys, os
 
-# This function and its data should move into daklib/extensions.py
-# or something.
-replaced_funcs = {}
-replace_funcs = {}
-def replace_dak_function(module,name):
-    def x(f):
-        def myfunc(*a,**kw):
-           global replaced_funcs
-            f(replaced_funcs[name], *a, **kw)
-       myfunc.__name__ = f.__name__
-       myfunc.__doc__ = f.__doc__
-       myfunc.__dict__.update(f.__dict__)
-
-        replace_funcs["%s:%s" % (module,name)] = myfunc
-       return f
-    return x
+import daklib.extensions
+from daklib.extensions import replace_dak_function
 
 @replace_dak_function("process-unchecked", "check_signed_by_key")
 def check_signed_by_key(oldfn):
@@ -35,14 +21,4 @@ def check_signed_by_key(oldfn):
 
     oldfn()
 
-def init(name):
-    global replaced_funcs
-
-    # This bit should be done automatically too
-    replaced_funcs = {}
-    for f,newfunc in replace_funcs.iteritems():
-        m,f = f.split(":",1)
-        if len(f) > 0 and m == name:
-           replaced_funcs[f] = dak_module.__dict__[f]
-           dak_module.__dict__[f] = newfunc