Revert "renamed functions and files to PEP8"

This reverts commit 3c9d517.

Author: Alison Wu

src/diffpy/utils/parsers/data_loader.py src/diffpy/utils/parsers/loaddata.pysrc/diffpy/utils/parsers/data_loader.py renamed to src/diffpy/utils/parsers/loaddata.py

@@ -16,7 +16,7 @@
 import numpy
 
 
-def load_data(filename, minrows=10, headers=False, hdel="=", hignore=None, **kwargs):
+def loadData(filename, minrows=10, headers=False, hdel="=", hignore=None, **kwargs):
     """Find and load data from a text file.
 
     The data block is identified as the first matrix block of at least minrows rows and constant number of columns.
@@ -54,7 +54,7 @@ def load_data(filename, minrows=10, headers=False, hdel="=", hignore=None, **kwa
         set delimiter to ','.
     unpack: bool
         Return data as a sequence of columns that allows tuple unpacking such as x, y =
-        load_data(FILENAME, unpack=True). Note transposing the loaded array as load_data(FILENAME).T has the same
+        loadData(FILENAME, unpack=True). Note transposing the loaded array as loadData(FILENAME).T has the same
         effect.
     usecols:
         Zero-based index of columns to be loaded, by default use all detected columns. The reading skips
@@ -226,7 +226,7 @@ def readfp(self, fp, append=False):
 
         File details include:
          *  File name.
-         *  All data blocks findable by load_data.
+         *  All data blocks findable by loadData.
          *  Headers (if present) for each data block. (Generally the headers contain column name information).
         """
         self._reset()

src/diffpy/utils/parsers/serializer.py src/diffpy/utils/parsers/serialization.pysrc/diffpy/utils/parsers/serializer.py renamed to src/diffpy/utils/parsers/serialization.py

@@ -17,7 +17,7 @@
 )
 
 
-class DiffractionObject:
+class Diffraction_object:
     def __init__(self, name="", wavelength=None):
         self.name = name
         self.wavelength = wavelength
@@ -29,7 +29,7 @@ def __init__(self, name="", wavelength=None):
         self.metadata = {}
 
     def __eq__(self, other):
-        if not isinstance(other, DiffractionObject):
+        if not isinstance(other, Diffraction_object):
             return NotImplemented
         self_attributes = [key for key in self.__dict__ if not key.startswith("_")]
         other_attributes = [key for key in other.__dict__ if not key.startswith("_")]
@@ -59,8 +59,8 @@ def __add__(self, other):
         if isinstance(other, int) or isinstance(other, float) or isinstance(other, np.ndarray):
             summed.on_tth[1] = self.on_tth[1] + other
             summed.on_q[1] = self.on_q[1] + other
-        elif not isinstance(other, DiffractionObject):
-            raise TypeError("I only know how to sum two DiffractionObject objects")
+        elif not isinstance(other, Diffraction_object):
+            raise TypeError("I only know how to sum two Diffraction_object objects")
         elif self.on_tth[0].all() != other.on_tth[0].all():
             raise RuntimeError(x_grid_emsg)
         else:
@@ -73,7 +73,7 @@ def __radd__(self, other):
         if isinstance(other, int) or isinstance(other, float) or isinstance(other, np.ndarray):
             summed.on_tth[1] = self.on_tth[1] + other
             summed.on_q[1] = self.on_q[1] + other
-        elif not isinstance(other, DiffractionObject):
+        elif not isinstance(other, Diffraction_object):
             raise TypeError("I only know how to sum two Scattering_object objects")
         elif self.on_tth[0].all() != other.on_tth[0].all():
             raise RuntimeError(x_grid_emsg)
@@ -87,7 +87,7 @@ def __sub__(self, other):
         if isinstance(other, int) or isinstance(other, float) or isinstance(other, np.ndarray):
             subtracted.on_tth[1] = self.on_tth[1] - other
             subtracted.on_q[1] = self.on_q[1] - other
-        elif not isinstance(other, DiffractionObject):
+        elif not isinstance(other, Diffraction_object):
             raise TypeError("I only know how to subtract two Scattering_object objects")
         elif self.on_tth[0].all() != other.on_tth[0].all():
             raise RuntimeError(x_grid_emsg)
@@ -101,7 +101,7 @@ def __rsub__(self, other):
         if isinstance(other, int) or isinstance(other, float) or isinstance(other, np.ndarray):
             subtracted.on_tth[1] = other - self.on_tth[1]
             subtracted.on_q[1] = other - self.on_q[1]
-        elif not isinstance(other, DiffractionObject):
+        elif not isinstance(other, Diffraction_object):
             raise TypeError("I only know how to subtract two Scattering_object objects")
         elif self.on_tth[0].all() != other.on_tth[0].all():
             raise RuntimeError(x_grid_emsg)
@@ -115,7 +115,7 @@ def __mul__(self, other):
         if isinstance(other, int) or isinstance(other, float) or isinstance(other, np.ndarray):
             multiplied.on_tth[1] = other * self.on_tth[1]
             multiplied.on_q[1] = other * self.on_q[1]
-        elif not isinstance(other, DiffractionObject):
+        elif not isinstance(other, Diffraction_object):
             raise TypeError("I only know how to multiply two Scattering_object objects")
         elif self.on_tth[0].all() != other.on_tth[0].all():
             raise RuntimeError(x_grid_emsg)
@@ -141,7 +141,7 @@ def __truediv__(self, other):
         if isinstance(other, int) or isinstance(other, float) or isinstance(other, np.ndarray):
             divided.on_tth[1] = other / self.on_tth[1]
             divided.on_q[1] = other / self.on_q[1]
-        elif not isinstance(other, DiffractionObject):
+        elif not isinstance(other, Diffraction_object):
             raise TypeError("I only know how to multiply two Scattering_object objects")
         elif self.on_tth[0].all() != other.on_tth[0].all():
             raise RuntimeError(x_grid_emsg)
@@ -389,7 +389,7 @@ def scale_to(self, target_diff_object, xtype=None, xvalue=None):
 
         Parameters
         ----------
-        target_diff_object: DiffractionObject
+        target_diff_object: Diffraction_object
           the diffractoin object you want to scale the current one on to
         xtype: string, optional.  Default is Q
           the xtype, from {XQUANTITIES}, that you will specify a point from to scale to
@@ -400,7 +400,7 @@ def scale_to(self, target_diff_object, xtype=None, xvalue=None):
 
         Returns
         -------
-        the rescaled DiffractionObject as a new object
+        the rescaled Diffraction_object as a new object
 
         """
         scaled = deepcopy(self)
@@ -454,7 +454,7 @@ def dump(self, filepath, xtype=None):
 
         with open(filepath, "w") as f:
             f.write(
-                f"[DiffractionObject]\nname = {self.name}\nwavelength = {self.wavelength}\n"
+                f"[Diffraction_object]\nname = {self.name}\nwavelength = {self.wavelength}\n"
                 f"scat_quantity = {self.scat_quantity}\n"
             )
             for key, value in self.metadata.items():