update deprecate loadData with load_data

Author: cadenmyers13

docs/source/examples/functions-example.rst

@@ -13,11 +13,11 @@ For example, if you want to load data from ``zro2_mo.xy`` in the ``example-data`
 
 .. code-block:: python
 
-    from diffpy.utils.parsers.loaddata import loadData
+    from diffpy.utils.parsers import load_data
     from diffpy.utils.diffraction_objects import DiffractionObject
 
     filepath = "../example-data/zro2_mo.xy"
-    xarray, yarray = loadData(filepath, unpack=True)
+    xarray, yarray = load_data(filepath, unpack=True)
     input_pattern = DiffractionObject(
         xarray=xarray,
         yarray=yarray,

src/diffpy/labpdfproc/labpdfprocapp.py

@@ -12,7 +12,7 @@
     set_wavelength,
 )
 from diffpy.utils.diffraction_objects import XQUANTITIES, DiffractionObject
-from diffpy.utils.parsers.loaddata import loadData
+from diffpy.utils.parsers import load_data
 
 
 def _add_common_args(parser, use_gui=False):
@@ -139,7 +139,7 @@ def _save_correction(correction, input_path, args):
 
 
 def _load_pattern(path, xtype, wavelength, metadata):
-    x, y = loadData(path, unpack=True)
+    x, y = load_data(path, unpack=True)
     return DiffractionObject(
         xarray=x,
         yarray=y,
@@ -264,8 +264,8 @@ def create_parser(use_gui=False):
 
 
 def _handle_old_api_conversion(args):
-    """Convert `sample` command arguments to previous format so functions can
-    accept them without modification."""
+    """Convert `sample` command arguments to previous format so
+    functions can accept them without modification."""
     if args.command == "sample":
         # Convert sample args to theoretical_from_density format
         args = load_wavelength_from_config_file(args)

tests/test_fixtures.py

@@ -2,17 +2,17 @@
 
 import pytest
 
-from diffpy.utils.parsers.loaddata import loadData
+from diffpy.utils.parsers import load_data
 
 
 # Test that our readable and unreadable files are indeed readable and
-# unreadable by loadData (which is our definition of readable and unreadable)
-def test_loadData_with_input_files(user_filesystem):
+# unreadable by load_data (which is our definition of readable and unreadable)
+def test_load_data_with_input_files(user_filesystem):
     os.chdir(user_filesystem)
-    xarray_chi, yarray_chi = loadData("good_data.chi", unpack=True)
-    xarray_xy, yarray_xy = loadData("good_data.xy", unpack=True)
-    xarray_txt, yarray_txt = loadData("good_data.txt", unpack=True)
+    xarray_chi, yarray_chi = load_data("good_data.chi", unpack=True)
+    xarray_xy, yarray_xy = load_data("good_data.xy", unpack=True)
+    xarray_txt, yarray_txt = load_data("good_data.txt", unpack=True)
     with pytest.raises(ValueError):
-        xarray_txt, yarray_txt = loadData("unreadable_file.txt", unpack=True)
+        xarray_txt, yarray_txt = load_data("unreadable_file.txt", unpack=True)
     with pytest.raises(ValueError):
-        xarray_pkl, yarray_pkl = loadData("binary.pkl", unpack=True)
+        xarray_pkl, yarray_pkl = load_data("binary.pkl", unpack=True)