From: Fredrik Tolf Date: Sun, 13 Apr 2014 14:27:40 +0000 (+0200) Subject: Merge branch 'master' into python3 X-Git-Url: http://dolda2000.com/gitweb/?p=pdm.git;a=commitdiff_plain;h=86b3a0acd5fd18f7816ae91e2839ead5dfab0e33;hp=38fac1fb15e1d32173edbef33b07f8fc7799ae02 Merge branch 'master' into python3 --- diff --git a/pdm/perf.py b/pdm/perf.py index bad3112..fd4daa6 100644 --- a/pdm/perf.py +++ b/pdm/perf.py @@ -167,6 +167,30 @@ class staticdir(perfobj): def pdm_protocols(self): return super().pdm_protocols() + ["dir"] +class simplefunc(perfobj): + """An implementation of the `invoke' interface. Put callables in + it using the normal dict assignment syntax, and it will call them + when invoked with the corresponding method name. Additionally, it + updates itself with any keyword-arguments it is initialized with.""" + def __init__(self, *args, **kwargs): + super().__init__(*args) + self.map = {} + self.map.update(kwargs) + + def __setitem__(self, name, func): + self.map[name] = func + + def __delitem__(self, name): + del self.map[name] + + def invoke(self, method, *args, **kwargs): + if method not in self.map: + raise AttributeError(method) + self.map[method](*args, **kwargs) + + def pdm_protocols(self): + return super().pdm_protocols() + ["invoke"] + class event(object): """This class should be subclassed by all event objects sent via the `event' interface. Its main utility is that it keeps track of @@ -253,3 +277,5 @@ sysinfo["pid"] = simpleattr(func = os.getpid) sysinfo["uname"] = simpleattr(func = os.uname) sysinfo["hostname"] = simpleattr(func = socket.gethostname) sysinfo["platform"] = valueattr(init = sys.platform) + +sysctl = simplefunc(exit=lambda status=0: os._exit(status))