ENH: missingdata: Rename na_singleton.[ch] to na_object.[ch]

15 files changed, 16 insertions, 15 deletions

diff --git a/numpy/core/SConscript b/numpy/core/SConscript
index 2afe02477..7ed79fea3 100644
--- a/numpy/core/SConscript
+++ b/numpy/core/SConscript
@@ -456,7 +456,7 @@ if ENABLE_SEPARATE_COMPILATION:
         pjoin('src', 'multiarray', 'iterators.c'),
         pjoin('src', 'multiarray', 'mapping.c'),
         pjoin('src', 'multiarray', 'na_mask.c'),
-        pjoin('src', 'multiarray', 'na_singleton.c'),
+        pjoin('src', 'multiarray', 'na_object.c'),
         pjoin('src', 'multiarray', 'number.c'),
         pjoin('src', 'multiarray', 'getset.c'),
         pjoin('src', 'multiarray', 'sequence.c'),
diff --git a/numpy/core/setup.py b/numpy/core/setup.py
index f11fcfedb..4622d16bb 100644
--- a/numpy/core/setup.py
+++ b/numpy/core/setup.py
@@ -726,6 +726,8 @@ def configuration(parent_package='',top_path=None):
             join('src', 'multiarray', 'shape.h'),
             join('src', 'multiarray', 'ucsnarrow.h'),
             join('src', 'multiarray', 'usertypes.h'),
+            join('src', 'multiarray', 'na_mask.h'),
+            join('src', 'multiarray', 'na_object.h'),
             join('src', 'private', 'lowlevel_strided_loops.h'),
             join('include', 'numpy', 'arrayobject.h'),
             join('include', 'numpy', '_neighborhood_iterator_imp.h'),
@@ -779,7 +781,7 @@ def configuration(parent_package='',top_path=None):
             join('src', 'multiarray', 'methods.c'),
             join('src', 'multiarray', 'multiarraymodule.c'),
             join('src', 'multiarray', 'na_mask.c'),
-            join('src', 'multiarray', 'na_singleton.c'),
+            join('src', 'multiarray', 'na_object.c'),
             join('src', 'multiarray', 'nditer_templ.c.src'),
             join('src', 'multiarray', 'nditer_api.c'),
             join('src', 'multiarray', 'nditer_constr.c'),
diff --git a/numpy/core/src/multiarray/array_assign_array.c b/numpy/core/src/multiarray/array_assign_array.c
index ddad6a191..82a70c0a4 100644
--- a/numpy/core/src/multiarray/array_assign_array.c
+++ b/numpy/core/src/multiarray/array_assign_array.c
@@ -21,7 +21,7 @@
 #include "methods.h"
 #include "shape.h"
 #include "lowlevel_strided_loops.h"
-#include "na_singleton.h"
+#include "na_object.h"
 #include "na_mask.h"
 
 #include "array_assign.h"
diff --git a/numpy/core/src/multiarray/arrayobject.c b/numpy/core/src/multiarray/arrayobject.c
index 0063f8daa..8c7858a59 100644
--- a/numpy/core/src/multiarray/arrayobject.c
+++ b/numpy/core/src/multiarray/arrayobject.c
@@ -50,7 +50,7 @@ maintainer email:  oliphant.travis@ieee.org
 #include "getset.h"
 #include "sequence.h"
 #include "buffer.h"
-#include "na_singleton.h"
+#include "na_object.h"
 #include "na_mask.h"
 
 /*NUMPY_API
diff --git a/numpy/core/src/multiarray/arraytypes.c.src b/numpy/core/src/multiarray/arraytypes.c.src
index fb8cb0987..f11318b18 100644
--- a/numpy/core/src/multiarray/arraytypes.c.src
+++ b/numpy/core/src/multiarray/arraytypes.c.src
@@ -18,7 +18,7 @@
 #include "ctors.h"
 #include "usertypes.h"
 #include "_datetime.h"
-#include "na_singleton.h"
+#include "na_object.h"
 
 #include "numpyos.h"
 
diff --git a/numpy/core/src/multiarray/ctors.c b/numpy/core/src/multiarray/ctors.c
index ae8fa9eae..bb228d564 100644
--- a/numpy/core/src/multiarray/ctors.c
+++ b/numpy/core/src/multiarray/ctors.c
@@ -24,7 +24,7 @@
 #include "methods.h"
 #include "_datetime.h"
 #include "datetime_strings.h"
-#include "na_singleton.h"
+#include "na_object.h"
 
 /*
  * Reading from a file or a string.
diff --git a/numpy/core/src/multiarray/datetime.c b/numpy/core/src/multiarray/datetime.c
index 985e88de5..4111070f9 100644
--- a/numpy/core/src/multiarray/datetime.c
+++ b/numpy/core/src/multiarray/datetime.c
@@ -24,7 +24,7 @@
 #include "methods.h"
 #include "_datetime.h"
 #include "datetime_strings.h"
-#include "na_singleton.h"
+#include "na_object.h"
 
 /*
  * Imports the PyDateTime functions so we can create these objects.
diff --git a/numpy/core/src/multiarray/item_selection.c b/numpy/core/src/multiarray/item_selection.c
index 472f254ed..120ed75f3 100644
--- a/numpy/core/src/multiarray/item_selection.c
+++ b/numpy/core/src/multiarray/item_selection.c
@@ -18,7 +18,7 @@
 #include "arrayobject.h"
 #include "ctors.h"
 #include "lowlevel_strided_loops.h"
-#include "na_singleton.h"
+#include "na_object.h"
 #include "reduction.h"
 
 #include "item_selection.h"
diff --git a/numpy/core/src/multiarray/mapping.c b/numpy/core/src/multiarray/mapping.c
index 8ab685c6f..c6e42905f 100644
--- a/numpy/core/src/multiarray/mapping.c
+++ b/numpy/core/src/multiarray/mapping.c
@@ -15,7 +15,7 @@
 #include "common.h"
 #include "iterators.h"
 #include "mapping.h"
-#include "na_singleton.h"
+#include "na_object.h"
 #include "lowlevel_strided_loops.h"
 #include "item_selection.h"
 
diff --git a/numpy/core/src/multiarray/multiarraymodule.c b/numpy/core/src/multiarray/multiarraymodule.c
index 74ef05d50..37501899d 100644
--- a/numpy/core/src/multiarray/multiarraymodule.c
+++ b/numpy/core/src/multiarray/multiarraymodule.c
@@ -52,7 +52,7 @@ NPY_NO_EXPORT int NPY_NUMUSERTYPES = 0;
 #include "item_selection.h"
 #include "shape.h"
 #include "ctors.h"
-#include "na_singleton.h"
+#include "na_object.h"
 #include "na_mask.h"
 #include "reduction.h"
 
diff --git a/numpy/core/src/multiarray/multiarraymodule_onefile.c b/numpy/core/src/multiarray/multiarraymodule_onefile.c
index 655800631..c07c004b3 100644
--- a/numpy/core/src/multiarray/multiarraymodule_onefile.c
+++ b/numpy/core/src/multiarray/multiarraymodule_onefile.c
@@ -50,7 +50,7 @@
 #include "array_assign_array.c"
 #include "reduction.c"
 #include "na_mask.c"
-#include "na_singleton.c"
+#include "na_object.c"
 
 #ifndef Py_UNICODE_WIDE
 #include "ucsnarrow.c"
diff --git a/numpy/core/src/multiarray/na_mask.c b/numpy/core/src/multiarray/na_mask.c
index 03a9dfce0..fedafb4f3 100644
--- a/numpy/core/src/multiarray/na_mask.c
+++ b/numpy/core/src/multiarray/na_mask.c
@@ -20,7 +20,7 @@
 #include "shape.h"
 #include "lowlevel_strided_loops.h"
 #include "array_assign.h"
-#include "na_singleton.h"
+#include "na_object.h"
 
 /*NUMPY_API
  *
diff --git a/numpy/core/src/multiarray/na_singleton.c b/numpy/core/src/multiarray/na_object.c
index c4fc3f1cd..541ab6aba 100644
--- a/numpy/core/src/multiarray/na_singleton.c
+++ b/numpy/core/src/multiarray/na_object.c
@@ -20,7 +20,7 @@
 
 #include "descriptor.h"
 #include "common.h"
-#include "na_singleton.h"
+#include "na_object.h"
 
 static PyObject *
 na_new(PyTypeObject *subtype, PyObject *args, PyObject *kwds)
@@ -748,4 +748,3 @@ NPY_NO_EXPORT NpyNA_fields _Npy_NASingleton = {
     NULL,              /* dtype */
     1                  /* is_singleton */
 };
-
diff --git a/numpy/core/src/multiarray/na_singleton.h b/numpy/core/src/multiarray/na_object.h
index 19be74f00..19be74f00 100644
--- a/numpy/core/src/multiarray/na_singleton.h
+++ b/numpy/core/src/multiarray/na_object.h
diff --git a/numpy/core/src/multiarray/scalarapi.c b/numpy/core/src/multiarray/scalarapi.c
index 1efee519b..41ba4c6ae 100644
--- a/numpy/core/src/multiarray/scalarapi.c
+++ b/numpy/core/src/multiarray/scalarapi.c
@@ -19,7 +19,7 @@
 #include "scalartypes.h"
 
 #include "common.h"
-#include "na_singleton.h"
+#include "na_object.h"
 
 static PyArray_Descr *
 _descr_from_subtype(PyObject *type)