Minor edits for PEP-8, move attributes to second input to create a gr…

…idgen object in Gridgen.from_spec()
phobson · Nov 14, 2018 · 4717e43 · 4717e43
1 parent faf6864
commit 4717e43
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pygridgen/grid.py b/pygridgen/grid.py
@@ -1000,7 +1000,7 @@ def to_spec(self):
     def from_spec(cls, attributes):
         focus_spec = attributes.pop('focus', None)
         focus = Focus.from_spec(focus_spec)
-        return cls(**attributes, focus=focus)
+        return cls(focus=focus, **attributes)
 
 
 def rho_to_vert(xr, yr, pm, pn, ang):  # pragma: no cover

diff --git a/pygridgen/tests/test_focus.py b/pygridgen/tests/test_focus.py
@@ -149,7 +149,7 @@ def test_full_focus_called(full_focus, xy):
 
     nptest.assert_array_almost_equal(xf, known_focused_x, decimal=3)
     nptest.assert_array_almost_equal(yf, known_focused_y, decimal=3)
-    
+
 
 def test_focus_to_from_spec():
     fpx = pygridgen.grid._FocusPoint(0.25, 'x', 4, 0.5)