CLN: Move base.StringMixin to computations.common

pandas/core/base.py

@@ -46,30 +46,6 @@
 )
 
 
-class StringMixin:
-    """
-    Implements string methods so long as object defines a `__str__` method.
-    """
-
-    # side note - this could be made into a metaclass if more than one
-    #             object needs
-
-    # ----------------------------------------------------------------------
-    # Formatting
-
-    def __str__(self):
-        """
-        Return a string representation for a particular Object
-        """
-        raise AbstractMethodError(self)
-
-    def __repr__(self):
-        """
-        Return a string representation for a particular object.
-        """
-        return str(self)
-
-
 class PandasObject(DirNamesMixin):
 
     """baseclass for various pandas objects"""

pandas/core/computation/common.py

@@ -36,3 +36,8 @@ def _remove_spaces_column_name(name):
 
 class NameResolutionError(NameError):
     pass
+
+
+class StringMixin:
+    # TODO: delete this class. Removing this ATM caused a failure.
+    pass

pandas/core/computation/expr.py

@@ -13,7 +13,6 @@
 
 import pandas as pd
 from pandas.core import common as com
-from pandas.core.base import StringMixin
 from pandas.core.computation.common import (
     _BACKTICK_QUOTED_STRING,
     _remove_spaces_column_name,
@@ -799,7 +798,7 @@ def __init__(self, env, engine, parser, preparser=lambda x: x):
         super().__init__(env, engine, parser, preparser=preparser)
 
 
-class Expr(StringMixin):
+class Expr:
 
     """Object encapsulating an expression.
 
@@ -831,7 +830,7 @@ def assigner(self):
     def __call__(self):
         return self.terms(self.env)
 
-    def __str__(self):
+    def __repr__(self):
         return printing.pprint_thing(self.terms)
 
     def __len__(self):

pandas/core/computation/ops.py

@@ -12,7 +12,6 @@
 
 from pandas.core.dtypes.common import is_list_like, is_scalar
 
-from pandas.core.base import StringMixin
 import pandas.core.common as com
 from pandas.core.computation.common import _ensure_decoded, _result_type_many
 from pandas.core.computation.scope import _DEFAULT_GLOBALS
@@ -63,7 +62,7 @@ def __init__(self, name, is_local):
         super().__init__(msg.format(name))
 
 
-class Term(StringMixin):
+class Term:
     def __new__(cls, name, env, side=None, encoding=None):
         klass = Constant if not isinstance(name, str) else cls
         supr_new = super(Term, klass).__new__
@@ -82,7 +81,7 @@ def __init__(self, name, env, side=None, encoding=None):
     def local_name(self):
         return self.name.replace(_LOCAL_TAG, "")
 
-    def __str__(self):
+    def __repr__(self):
         return pprint_thing(self.name)
 
     def __call__(self, *args, **kwargs):
@@ -182,7 +181,7 @@ def _resolve_name(self):
     def name(self):
         return self.value
 
-    def __str__(self):
+    def __repr__(self):
         # in python 2 str() of float
         # can truncate shorter than repr()
         return repr(self.name)
@@ -191,7 +190,7 @@ def __str__(self):
 _bool_op_map = {"not": "~", "and": "&", "or": "|"}
 
 
-class Op(StringMixin):
+class Op:
 
     """Hold an operator of arbitrary arity
     """
@@ -204,7 +203,7 @@ def __init__(self, op, operands, *args, **kwargs):
     def __iter__(self):
         return iter(self.operands)
 
-    def __str__(self):
+    def __repr__(self):
         """Print a generic n-ary operator and its operands using infix
         notation"""
         # recurse over the operands
@@ -537,7 +536,7 @@ def __call__(self, env):
         operand = self.operand(env)
         return self.func(operand)
 
-    def __str__(self):
+    def __repr__(self):
         return pprint_thing("{0}({1})".format(self.op, self.operand))
 
     @property
@@ -562,7 +561,7 @@ def __call__(self, env):
         with np.errstate(all="ignore"):
             return self.func.func(*operands)
 
-    def __str__(self):
+    def __repr__(self):
         operands = map(str, self.operands)
         return pprint_thing("{0}({1})".format(self.op, ",".join(operands)))
 

pandas/core/computation/pytables.py

@@ -11,7 +11,6 @@
 from pandas.core.dtypes.common import is_list_like
 
 import pandas as pd
-from pandas.core.base import StringMixin
 import pandas.core.common as com
 from pandas.core.computation import expr, ops
 from pandas.core.computation.common import _ensure_decoded
@@ -32,8 +31,7 @@ def __init__(self, level, global_dict=None, local_dict=None, queryables=None):
 class Term(ops.Term):
     def __new__(cls, name, env, side=None, encoding=None):
         klass = Constant if not isinstance(name, str) else cls
-        supr_new = StringMixin.__new__
-        return supr_new(klass)
+        return object.__new__(klass)
 
     def __init__(self, name, env, side=None, encoding=None):
         super().__init__(name, env, side=side, encoding=encoding)
@@ -231,7 +229,7 @@ def convert_values(self):
 
 
 class FilterBinOp(BinOp):
-    def __str__(self):
+    def __repr__(self):
         return pprint_thing(
             "[Filter : [{lhs}] -> [{op}]".format(lhs=self.filter[0], op=self.filter[1])
         )
@@ -297,7 +295,7 @@ def evaluate(self):
 
 
 class ConditionBinOp(BinOp):
-    def __str__(self):
+    def __repr__(self):
         return pprint_thing("[Condition : [{cond}]]".format(cond=self.condition))
 
     def invert(self):
@@ -548,7 +546,7 @@ def __init__(self, where, queryables=None, encoding=None, scope_level=0):
             )
             self.terms = self.parse()
 
-    def __str__(self):
+    def __repr__(self):
         if self.terms is not None:
             return pprint_thing(self.terms)
         return pprint_thing(self.expr)

pandas/core/computation/scope.py

@@ -15,8 +15,8 @@
 from pandas._libs.tslibs import Timestamp
 from pandas.compat.chainmap import DeepChainMap
 
-from pandas.core.base import StringMixin
 import pandas.core.computation as compu
+from pandas.core.computation.common import StringMixin
 
 
 def _ensure_scope(
@@ -141,7 +141,7 @@ def __init__(
         self.resolvers = DeepChainMap(*resolvers)
         self.temps = {}
 
-    def __str__(self):
+    def __repr__(self):
         scope_keys = _get_pretty_string(list(self.scope.keys()))
         res_keys = _get_pretty_string(list(self.resolvers.keys()))
         unicode_str = "{name}(scope={scope_keys}, resolvers={res_keys})"

pandas/tests/series/test_repr.py

@@ -14,7 +14,6 @@
     period_range,
     timedelta_range,
 )
-from pandas.core.base import StringMixin
 from pandas.core.index import MultiIndex
 import pandas.util.testing as tm
 
@@ -226,11 +225,11 @@ class TestCategoricalRepr:
     def test_categorical_repr_unicode(self):
         # see gh-21002
 
-        class County(StringMixin):
+        class County:
             name = "San Sebastián"
             state = "PR"
 
-            def __str__(self):
+            def __repr__(self):
                 return self.name + ", " + self.state
 
         cat = pd.Categorical([County() for _ in range(61)])