solving conflicts

Author: nilodna

src/parcels/_core/field.py

@@ -18,8 +18,8 @@
     AllParcelsErrorCodes,
     StatusCode,
 )
-from parcels._core.utils.time import TimeInterval
 from parcels._core.utils.string import _assert_str_and_python_varname
+from parcels._core.utils.time import TimeInterval
 from parcels._core.uxgrid import UxGrid
 from parcels._core.xgrid import XGrid, _transpose_xfield_data_to_tzyx
 from parcels._reprs import default_repr
@@ -102,7 +102,7 @@ def __init__(
             raise ValueError(
                 f"Expected `data` to be a uxarray.UxDataArray or xarray.DataArray object, got {type(data)}."
             )
-        
+
         _assert_str_and_python_varname(name)
 
         if not isinstance(grid, (UxGrid, XGrid)):

src/parcels/_core/fieldset.py

@@ -11,10 +11,9 @@
 
 from parcels._core.converters import Geographic, GeographicPolar
 from parcels._core.field import Field, VectorField
-from parcels._core.utils.string import _assert_valid_python_varname
+from parcels._core.utils.string import _assert_str_and_python_varname
 from parcels._core.utils.time import get_datetime_type_calendar
 from parcels._core.utils.time import is_compatible as datetime_is_compatible
-from parcels._core.utils.string import _assert_str_and_python_varname
 from parcels._core.xgrid import _DEFAULT_XGCM_KWARGS, XGrid
 from parcels._logger import logger
 from parcels._typing import Mesh

src/parcels/_core/particle.py

@@ -8,8 +8,8 @@
 
 from parcels._compat import _attrgetter_helper
 from parcels._core.statuscodes import StatusCode
-from parcels._core.utils.time import TimeInterval
 from parcels._core.utils.string import _assert_str_and_python_varname
+from parcels._core.utils.time import TimeInterval
 from parcels._reprs import _format_list_items_multiline
 
 __all__ = ["KernelParticle", "Particle", "ParticleClass", "Variable"]

src/parcels/_core/utils/string.py

@@ -13,4 +13,4 @@ def _assert_str_and_python_varname(name):
         raise ValueError(
             f"Received invalid Python variable name {name!r}: it is a reserved keyword. "
             f"HINT: avoid using the following names: {', '.join(kwlist)}"
-        )
+        )