From 6774b35a6949667f335e45cdaf5bc207f80045b3 Mon Sep 17 00:00:00 2001
From: Philipp Arras <parras@mpa-garching.mpg.de>
Date: Wed, 15 Aug 2018 13:12:00 +0200
Subject: [PATCH] Cosmetics

---
 nifty5/domain_tuple.py                    | 2 +-
 nifty5/extra/energy_and_model_tests.py    | 6 ++++--
 nifty5/extra/operator_tests.py            | 6 ++++--
 nifty5/library/amplitude_model.py         | 2 +-
 nifty5/library/correlated_fields.py       | 4 ++--
 nifty5/library/inverse_gamma_model.py     | 4 ++--
 nifty5/minimization/descent_minimizers.py | 1 +
 nifty5/minimization/energy_adapter.py     | 6 ++----
 nifty5/minimization/scipy_minimizer.py    | 6 +++---
 nifty5/multi_field.py                     | 2 +-
 nifty5/plotting/plot.py                   | 4 ++--
 nifty5/sugar.py                           | 3 +--
 nifty5/utilities.py                       | 4 ++--
 13 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/nifty5/domain_tuple.py b/nifty5/domain_tuple.py
index cdbb0db10..547b8e51b 100644
--- a/nifty5/domain_tuple.py
+++ b/nifty5/domain_tuple.py
@@ -18,9 +18,9 @@
 
 from __future__ import absolute_import, division, print_function
 
+from . import utilities
 from .compat import *
 from .domains.domain import Domain
-from . import utilities
 
 
 class DomainTuple(object):
diff --git a/nifty5/extra/energy_and_model_tests.py b/nifty5/extra/energy_and_model_tests.py
index 40b93a144..60022c101 100644
--- a/nifty5/extra/energy_and_model_tests.py
+++ b/nifty5/extra/energy_and_model_tests.py
@@ -17,10 +17,12 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from __future__ import absolute_import, division, print_function
-from ..compat import *
+
 import numpy as np
-from ..sugar import from_random
+
+from ..compat import *
 from ..linearization import Linearization
+from ..sugar import from_random
 
 __all__ = ["check_value_gradient_consistency",
            "check_value_gradient_metric_consistency"]
diff --git a/nifty5/extra/operator_tests.py b/nifty5/extra/operator_tests.py
index e234d6e7c..e2a83f981 100644
--- a/nifty5/extra/operator_tests.py
+++ b/nifty5/extra/operator_tests.py
@@ -17,10 +17,12 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from __future__ import absolute_import, division, print_function
-from ..compat import *
+
 import numpy as np
-from ..sugar import from_random
+
+from ..compat import *
 from ..field import Field
+from ..sugar import from_random
 
 __all__ = ["consistency_check"]
 
diff --git a/nifty5/library/amplitude_model.py b/nifty5/library/amplitude_model.py
index a404be0cb..1e0b10dbc 100644
--- a/nifty5/library/amplitude_model.py
+++ b/nifty5/library/amplitude_model.py
@@ -25,8 +25,8 @@ from ..domains.power_space import PowerSpace
 from ..domains.unstructured_domain import UnstructuredDomain
 from ..field import Field
 from ..multi_domain import MultiDomain
-from ..sugar import makeOp, sqrt
 from ..operators.operator import Operator
+from ..sugar import makeOp, sqrt
 
 
 def _ceps_kernel(dof_space, k, a, k0):
diff --git a/nifty5/library/correlated_fields.py b/nifty5/library/correlated_fields.py
index 3ff54c410..78c428e7b 100644
--- a/nifty5/library/correlated_fields.py
+++ b/nifty5/library/correlated_fields.py
@@ -21,11 +21,11 @@ from __future__ import absolute_import, division, print_function
 from ..compat import *
 from ..domain_tuple import DomainTuple
 from ..multi_domain import MultiDomain
+from ..operators.distributors import PowerDistributor
 from ..operators.domain_distributor import DomainDistributor
 from ..operators.harmonic_operators import HarmonicTransformOperator
-from ..operators.distributors import PowerDistributor
-from ..sugar import exp
 from ..operators.simple_linear_operators import FieldAdapter
+from ..sugar import exp
 
 
 def CorrelatedField(s_space, amplitude_model):
diff --git a/nifty5/library/inverse_gamma_model.py b/nifty5/library/inverse_gamma_model.py
index aa8292e33..9be2acce1 100644
--- a/nifty5/library/inverse_gamma_model.py
+++ b/nifty5/library/inverse_gamma_model.py
@@ -22,9 +22,9 @@ import numpy as np
 from scipy.stats import invgamma, norm
 
 from ..compat import *
-from ..operators.operator import Operator
-from ..linearization import Linearization
 from ..field import Field
+from ..linearization import Linearization
+from ..operators.operator import Operator
 from ..sugar import makeOp
 
 
diff --git a/nifty5/minimization/descent_minimizers.py b/nifty5/minimization/descent_minimizers.py
index 9cbc92675..0517bd814 100644
--- a/nifty5/minimization/descent_minimizers.py
+++ b/nifty5/minimization/descent_minimizers.py
@@ -19,6 +19,7 @@
 from __future__ import absolute_import, division, print_function
 
 import numpy as np
+
 from ..compat import *
 from ..logger import logger
 from .line_search_strong_wolfe import LineSearchStrongWolfe
diff --git a/nifty5/minimization/energy_adapter.py b/nifty5/minimization/energy_adapter.py
index 1ee944ae9..f85d2e9d8 100644
--- a/nifty5/minimization/energy_adapter.py
+++ b/nifty5/minimization/energy_adapter.py
@@ -1,12 +1,10 @@
 from __future__ import absolute_import, division, print_function
 
 from ..compat import *
-from ..minimization.energy import Energy
 from ..linearization import Linearization
-from ..multi_field import MultiField
-from ..operators.scaling_operator import ScalingOperator
+from ..minimization.energy import Energy
 from ..operators.block_diagonal_operator import BlockDiagonalOperator
-import numpy as np
+from ..operators.scaling_operator import ScalingOperator
 
 
 class EnergyAdapter(Energy):
diff --git a/nifty5/minimization/scipy_minimizer.py b/nifty5/minimization/scipy_minimizer.py
index fbf2cf66d..df37006b2 100644
--- a/nifty5/minimization/scipy_minimizer.py
+++ b/nifty5/minimization/scipy_minimizer.py
@@ -19,15 +19,15 @@
 from __future__ import absolute_import, division, print_function
 
 import numpy as np
+
 from .. import dobj
 from ..compat import *
 from ..field import Field
-from ..multi_field import MultiField
-from ..domain_tuple import DomainTuple
 from ..logger import logger
+from ..multi_field import MultiField
+from ..utilities import iscomplextype
 from .iteration_controllers import IterationController
 from .minimizer import Minimizer
-from ..utilities import iscomplextype
 
 
 def _multiToArray(fld):
diff --git a/nifty5/multi_field.py b/nifty5/multi_field.py
index a3dd8cfbe..5f6aa304a 100644
--- a/nifty5/multi_field.py
+++ b/nifty5/multi_field.py
@@ -20,10 +20,10 @@ from __future__ import absolute_import, division, print_function
 
 import numpy as np
 
+from . import utilities
 from .compat import *
 from .field import Field
 from .multi_domain import MultiDomain
-from . import utilities
 
 
 class MultiField(object):
diff --git a/nifty5/plotting/plot.py b/nifty5/plotting/plot.py
index 1c930fe13..915f84d7e 100644
--- a/nifty5/plotting/plot.py
+++ b/nifty5/plotting/plot.py
@@ -22,13 +22,13 @@ import os
 
 import numpy as np
 
+from .. import dobj
 from ..compat import *
-from ..field import Field
 from ..domains.gl_space import GLSpace
 from ..domains.hp_space import HPSpace
 from ..domains.power_space import PowerSpace
 from ..domains.rg_space import RGSpace
-from .. import dobj
+from ..field import Field
 
 # relevant properties:
 # - x/y size
diff --git a/nifty5/sugar.py b/nifty5/sugar.py
index b69e04d4b..39b7f718f 100644
--- a/nifty5/sugar.py
+++ b/nifty5/sugar.py
@@ -28,13 +28,12 @@ from .domain_tuple import DomainTuple
 from .domains.power_space import PowerSpace
 from .field import Field
 from .logger import logger
-from .operators.block_diagonal_operator import BlockDiagonalOperator
 from .multi_domain import MultiDomain
 from .multi_field import MultiField
+from .operators.block_diagonal_operator import BlockDiagonalOperator
 from .operators.diagonal_operator import DiagonalOperator
 from .operators.distributors import PowerDistributor
 
-
 __all__ = ['PS_field', 'power_analyze', 'create_power_operator',
            'create_harmonic_smoothing_operator', 'from_random',
            'full', 'from_global_data', 'from_local_data',
diff --git a/nifty5/utilities.py b/nifty5/utilities.py
index c1acc1bd5..9dc3ef836 100644
--- a/nifty5/utilities.py
+++ b/nifty5/utilities.py
@@ -22,9 +22,9 @@ import collections
 from itertools import product
 
 import numpy as np
-from future.utils import with_metaclass
 import pyfftw
-from pyfftw.interfaces.numpy_fft import rfftn, fftn
+from future.utils import with_metaclass
+from pyfftw.interfaces.numpy_fft import fftn, rfftn
 
 from .compat import *
 
-- 
GitLab