From eddecd8189d7f12a916b2de820e631564fbd488a Mon Sep 17 00:00:00 2001 From: VEZINET Didier Date: Fri, 13 Sep 2019 11:57:59 +0200 Subject: [PATCH 1/2] [Issue 187] Removed extra verbose __init__, added mobile=False in remaining one --- tofu/geom/_core.py | 14 +------------- tofu/version.py | 2 +- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/tofu/geom/_core.py b/tofu/geom/_core.py index 7bb2d9014..9b92c0308 100644 --- a/tofu/geom/_core.py +++ b/tofu/geom/_core.py @@ -1500,22 +1500,10 @@ class PFC(StructOut): class CoilPF(StructOut): _color = 'r' - def __init__(self, Poly=None, Type=None, Lim=None, pos=None, extent=None, - Id=None, Name=None, Exp=None, shot=None, - sino_RefPt=None, sino_nP=_def.TorNP, - Clock=False, arrayorder='C', fromdict=None, - nturns=None, superconducting=None, active=None, - SavePath=os.path.abspath('./'), - SavePath_Include=tfpf.defInclude, color=None): - kwdargs = locals() - del kwdargs['self'], kwdargs['__class__'] - # super() - super(CoilPF,self).__init__(mobile=False, **kwdargs) - def __init__(self, nturns=None, superconducting=None, active=None, **kwdargs): # super() - super(CoilPF,self).__init__(**kwdargs) + super(CoilPF, self).__init__(mobile=False, **kwdargs) def _reset(self): # super() diff --git a/tofu/version.py b/tofu/version.py index 131f008cd..415551848 100644 --- a/tofu/version.py +++ b/tofu/version.py @@ -1,2 +1,2 @@ # Do not edit, pipeline versioning governed by git tags! -__version__ = '1.4.1-49-g373fc3c' +__version__ = '1.4.1-51-g96c8cd8' From fac9b0dce90e8b22bea8db9fa73db6291e581863 Mon Sep 17 00:00:00 2001 From: VEZINET Didier Date: Fri, 13 Sep 2019 12:04:24 +0200 Subject: [PATCH 2/2] [Issue 187] PEP8 compliance --- benchmarks/calc_signal_benchmark.py | 6 +++--- tofu/version.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/benchmarks/calc_signal_benchmark.py b/benchmarks/calc_signal_benchmark.py index 1f3bf17fb..14e6b89b1 100644 --- a/benchmarks/calc_signal_benchmark.py +++ b/benchmarks/calc_signal_benchmark.py @@ -42,9 +42,9 @@ # Defining defaults ################### -_LRES = [-3,-3,0] -_LLOS = [5,5,0] -_LT = [3,3,0] +_LRES = [-3, -3, 0] +_LLOS = [5, 5, 0] +_LT = [3, 3, 0] _NREP = 2 _DRES = abs(_LRES[1] - _LRES[0]) diff --git a/tofu/version.py b/tofu/version.py index 415551848..73f4b8973 100644 --- a/tofu/version.py +++ b/tofu/version.py @@ -1,2 +1,2 @@ # Do not edit, pipeline versioning governed by git tags! -__version__ = '1.4.1-51-g96c8cd8' +__version__ = '1.4.1-52-geddecd8'