From 29660ca63ce9cc5f38a6a99666f0d6fa4f16cd5c Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Tue, 21 Feb 2017 19:11:25 +0000
Subject: [PATCH] Modified decorator to allow calling a decorator without an argument
---
trisurf/analyses.py | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/trisurf/analyses.py b/trisurf/analyses.py
index 4862867..55d2af7 100644
--- a/trisurf/analyses.py
+++ b/trisurf/analyses.py
@@ -1,17 +1,22 @@
from . import trisurf
-def analysis(analysis_name='unnamed_analysis'):
+def analysis(*args):
"""Decorator for adding the analysis functions to function lists"""
def analysis_decorator(analysis_function):
trisurf._analysis_list[analysis_name]=analysis_function
def wrapper(*args, **kwargs):
analysis_function(*args,**kwargs)
return wrapper
- return analysis_decorator
+ if len(args) == 1 and callable(args[0]): #no arguments
+ analysis_name=args[0].__name__
+ return analysis_decorator(args[0])
+ else:
+ analysis_name=args[0]
+ return analysis_decorator
-@analysis('demo')
+@analysis
def demo(run, **kwargs):
host=kwargs.get('host', None)
print("Demo analysis")
--
Gitblit v1.9.3