Don't use column_names internally

- Use columns instead

Author: smathot

datamatrix/_datamatrix/_datamatrix.py

@@ -745,7 +745,7 @@ def __setstate__(self, state):
 
     def __dir__(self):
 
-        return self.column_names + object.__dir__(self)
+        return self.columns + object.__dir__(self)
 
     def __contains__(self, item):
 

datamatrix/_datamatrix/_row.py

@@ -48,6 +48,10 @@ def as_slice(self):
     @property
     def column_names(self):
         return self._datamatrix.column_names
+        
+    @property
+    def columns(self):
+        return self._datamatrix.columns
 
     def equals(self, other):
 
@@ -67,7 +71,7 @@ def equals(self, other):
 
     def __dir__(self):
 
-        return self.column_names + object.__dir__(self)
+        return self.columns + object.__dir__(self)
 
     def __len__(self):
 
@@ -80,7 +84,7 @@ def __getattr__(self, key):
     def __getitem__(self, key):
 
         if isinstance(key, int):
-            key = self._datamatrix.column_names[key]
+            key = self._datamatrix.columns[key]
         return self._datamatrix[key][self._index]
 
     def __setattr__(self, key, value):
@@ -90,11 +94,11 @@ def __setattr__(self, key, value):
     def __setitem__(self, key, value):
 
         if isinstance(key, int):
-            key = self._datamatrix.column_names[key]
+            key = self._datamatrix.columns[key]
         elif isinstance(key, str):
             # Create a new column with default values if the column does not
             # exist yet
-            if key not in self._datamatrix.column_names:
+            if key not in self._datamatrix.columns:
                 self._datamatrix[key] = \
                     self._datamatrix._default_col_type.default_value
         self._datamatrix[key][self._index] = value
@@ -109,5 +113,5 @@ def __str__(self):
 
     def __iter__(self):
 
-        for col in self._datamatrix.column_names:
+        for col in self._datamatrix.columns:
             yield col, self[col]

datamatrix/io/_text.py

@@ -114,6 +114,6 @@ def writetxt(dm, path, delimiter=',', quotechar='"'):
             quotechar=quotechar,
             lineterminator='\n'
         )
-        writer.writerow([utils.safe_decode(colname) for colname in dm.column_names])
+        writer.writerow([utils.safe_decode(colname) for colname in dm.columns])
         for row in dm:
             writer.writerow([utils.safe_decode(value) for colname, value in row])

datamatrix/operations.py

@@ -309,7 +309,7 @@ def weight(col):
                 % (weight, type(weight))
             )
         for c in range(weight):
-            for colname in dm1.column_names:
+            for colname in dm1.columns:
                 dm2[colname][i2] = dm1[colname][i1]
             i2 += 1
     return dm2
@@ -555,11 +555,11 @@ def fullfactorial(dm, ignore=u''):
     a = _fullfact(design)
     # Create an DataMatrix with empty columns
     fdm = DataMatrix(a.shape[0])
-    for name in dm.column_names:
+    for name in dm.columns:
         fdm[name] = u''
     for i in range(a.shape[0]):
         row = a[i]
-        for rownr, name in enumerate(dm.column_names):
+        for rownr, name in enumerate(dm.columns):
             fdm[name][i] = dm[name][int(row[rownr])]
     return fdm
 
@@ -888,9 +888,9 @@ def keep_only(dm, *cols):
                 ) % colname
             )
     for colname in colnames:
-        if colname not in dm.column_names:
+        if colname not in dm.columns:
             utils.logger.warning('no column named {}'.format(colname))
-    for colname in dm.column_names:
+    for colname in dm.columns:
         if colname not in colnames:
             del dm[colname]
     return dm

doc-pelican/content/pages/basic.md

@@ -42,7 +42,7 @@ for colname in dm.columns:
     for cell in dm[colname]: # Loop through all cells in the column
         print(cell) # do something with the cell
 # Or just see which columns exist
-print(dm.column_names)
+print(dm.columns)
 ~~~
 
 __Important note:__ Because of a limitation (or feature, if you will) of the Python language, the behavior of `and`, `or`, and chained (`x < y < z`) comparisons cannot be modified. These therefore do not work with `DataMatrix` objects as you would expect them to:
@@ -548,7 +548,7 @@ The `column_names` property gives a sorted list of all column names (without the
 
 
 ```python
-print(dm.column_names)
+print(dm.columns)
 ```
 
 

doc-pelican/content/pages/index.md

@@ -70,5 +70,5 @@ for colname in dm.columns:
     for cell in dm[colname]: # Loop through all cells in the column
         print(cell) # do something with the cell
 # Or just see which columns exist
-print(dm.column_names)
+print(dm.columns)
 ~~~

testcases/test_dataframe_compatibility.py

@@ -26,7 +26,7 @@ def test_dict_initialization():
     """Data can be passed as a dict at construction time."""
     for cls in TEST_CLASSES:
         obj = _make_sample(cls)
-        assert set(obj.columns if cls is pd.DataFrame else obj.column_names) == {"A", "B", "C"}
+        assert set(obj.columns if cls is pd.DataFrame else obj.columns) == {"A", "B", "C"}
 
 
 def test_list_of_dicts_initialization():
@@ -41,7 +41,7 @@ def test_list_of_dicts_initialization():
     for cls in TEST_CLASSES:
         obj = cls(data)
         # Check column names
-        assert set(obj.columns if cls is pd.DataFrame else obj.column_names) == {"A", "B", "C"}
+        assert set(obj.columns if cls is pd.DataFrame else obj.columns) == {"A", "B", "C"}
         # Check data integrity
         assert list(obj["A"]) == [1, 2, 3, 4]
         assert obj['A'].dtype == int
@@ -63,7 +63,7 @@ def test_list_of_dicts_with_missing_keys():
     for cls in TEST_CLASSES:
         obj = cls(data)
         # Check column names
-        assert set(obj.columns if cls is pd.DataFrame else obj.column_names) == {"A", "B", "C"}
+        assert set(obj.columns if cls is pd.DataFrame else obj.columns) == {"A", "B", "C"}
         # Check that missing values are handled (None or NaN)
         assert len(obj) == 4
         # Note: DataFrame uses NaN for missing numeric values and None for objects
@@ -75,7 +75,7 @@ def test_empty_list_initialization():
     for cls in TEST_CLASSES:
         obj = cls([])
         assert len(obj) == 0
-        assert len(obj.columns if cls is pd.DataFrame else obj.column_names) == 0
+        assert len(obj.columns if cls is pd.DataFrame else obj.columns) == 0
 
 
 def test_list_of_empty_dicts():
@@ -84,7 +84,7 @@ def test_list_of_empty_dicts():
     for cls in TEST_CLASSES:
         obj = cls(data)
         assert len(obj) == 3
-        assert len(obj.columns if cls is pd.DataFrame else obj.column_names) == 0
+        assert len(obj.columns if cls is pd.DataFrame else obj.columns) == 0
 
 def test_multi_column_selection():
     """Selecting a list of columns returns the expected subset."""

testcases/test_extra_operations.py

@@ -368,13 +368,13 @@ def test_keep_only():
     dm.c = 'y', 'z'
     for cols in (['b', 'c'], [dm.b, dm.c]):
         dm = ops.keep_only(dm, *cols)
-        assert 'a' not in dm.column_names
-        assert 'b' in dm.column_names
-        assert 'c' in dm.column_names
+        assert 'a' not in dm.columns
+        assert 'b' in dm.columns
+        assert 'c' in dm.columns
         dm = dm[cols]
-        assert 'a' not in dm.column_names
-        assert 'b' in dm.column_names
-        assert 'c' in dm.column_names
+        assert 'a' not in dm.columns
+        assert 'b' in dm.columns
+        assert 'c' in dm.columns
 
 
 def test_auto_type():

testcases/test_tools.py

@@ -34,7 +34,7 @@ def all_nan(*l):
 
 def check_dm(dm, ref):
 
-    assert dm.column_names == ref.column_names
+    assert dm.columns == ref.columns
     for column_name in dm.columns:
         assert not isinstance(column_name, bytes)
     for colname in dm.columns: