fix test code and update master

Author: baidoosik

doc/source/whatsnew/v0.24.0.rst

@@ -1420,6 +1420,7 @@ Interval
 Indexing
 ^^^^^^^^
 
+- Bug in :meth:`DataFrame.ne` fails if columns contain column name "dtype" (:issue:`22383`)
 - The traceback from a ``KeyError`` when asking ``.loc`` for a single missing label is now shorter and more clear (:issue:`21557`)
 - :class:`PeriodIndex` now emits a ``KeyError`` when a malformed string is looked up, which is consistent with the behavior of :class:`DatetimeIndex` (:issue:`22803`)
 - When ``.ix`` is asked for a missing integer label in a :class:`MultiIndex` with a first level of integer type, it now raises a ``KeyError``, consistently with the case of a flat :class:`Int64Index`, rather than falling back to positional indexing (:issue:`21593`)

pandas/core/computation/expressions.py

@@ -160,6 +160,8 @@ def _where_numexpr(cond, a, b):
 
 def _has_bool_dtype(x):
     try:
+        if not isinstance(x.dtype, np.dtype):
+            x = x.rename({'dtype': 'temporary_dtype'}, axis=1)
         return x.dtype == bool
     except AttributeError:
         try:

pandas/tests/test_expressions.py

@@ -443,3 +443,23 @@ def test_bool_ops_warn_on_arithmetic(self):
                     r = f(df, True)
                     e = fe(df, True)
                     tm.assert_frame_equal(r, e)
+
+    @pytest.mark.parametrize("test_input,expected", [
+        (DataFrame([[0, 1, 2, 'aa'], [0, 1, 2, 'aa'],
+                    [0, 1, 5, 'bb'], [0, 1, 5, 'bb'],
+                    [0, 1, 5, 'bb']], columns=['a', 'b', 'c', 'dtype']),
+         DataFrame([[False, False], [False, False],
+                    [False, False], [False, False],
+                    [False, False]], columns=['a', 'dtype'])),
+        (DataFrame([[0, 3, 2, 'aa'], [0, 4, 2, 'aa'],
+                    [0, 1, 1, 'bb'], [0, 1, 2, 'bb'],
+                    [0, 2, 9, 'bb'], ['cc', 4, 3, 1]],
+                   columns=['a', 'b', 'c', 'dtype']),
+         DataFrame([[False, False], [False, False],
+                   [False, False], [False, False],
+                   [False, False], [False, False]],
+                   columns=['a', 'dtype'])),
+    ])
+    def test_bool_ops_column_name_dtype(self, test_input, expected):
+        # GH 22383 - .ne fails if columns containing column name 'dtype'
+        assert_frame_equal(test_input.loc[:, ['a', 'dtype']].ne(test_input.loc[:, ['a', 'dtype']]), expected)