rename _EXPR_TYPE_ERROR -> EXPR_TYPE_ERROR

Author: kosiew

python/datafusion/dataframe.py

@@ -41,7 +41,7 @@
 from datafusion._internal import ParquetColumnOptions as ParquetColumnOptionsInternal
 from datafusion._internal import ParquetWriterOptions as ParquetWriterOptionsInternal
 from datafusion.expr import (
-    _EXPR_TYPE_ERROR,
+    EXPR_TYPE_ERROR,
     Expr,
     SortExpr,
     expr_list_to_raw_expr_list,
@@ -431,7 +431,7 @@ def filter(self, *predicates: Expr) -> DataFrame:
         df = self.df
         for p in predicates:
             if not isinstance(p, Expr):
-                raise TypeError(_EXPR_TYPE_ERROR)
+                raise TypeError(EXPR_TYPE_ERROR)
             df = df.filter(p.expr)
         return DataFrame(df)
 
@@ -446,7 +446,7 @@ def with_column(self, name: str, expr: Expr) -> DataFrame:
             DataFrame with the new column.
         """
         if not isinstance(expr, Expr):
-            raise TypeError(_EXPR_TYPE_ERROR)
+            raise TypeError(EXPR_TYPE_ERROR)
         return DataFrame(self.df.with_column(name, expr.expr))
 
     def with_columns(
@@ -483,14 +483,14 @@ def _simplify_expression(
                     and not isinstance(expr, Expr)
                     and any(isinstance(inner, str) for inner in expr)
                 ):
-                    raise TypeError(_EXPR_TYPE_ERROR)
+                    raise TypeError(EXPR_TYPE_ERROR)
                 try:
                     expr_list.extend(expr_list_to_raw_expr_list(expr))
                 except TypeError as err:
-                    raise TypeError(_EXPR_TYPE_ERROR) from err
+                    raise TypeError(EXPR_TYPE_ERROR) from err
             for alias, expr in named_exprs.items():
                 if not isinstance(expr, Expr):
-                    raise TypeError(_EXPR_TYPE_ERROR)
+                    raise TypeError(EXPR_TYPE_ERROR)
                 expr_list.append(expr.alias(alias).expr)
             return expr_list
 
@@ -536,7 +536,7 @@ def aggregate(
         aggs_exprs = []
         for agg in aggs_list:
             if not isinstance(agg, Expr):
-                raise TypeError(_EXPR_TYPE_ERROR)
+                raise TypeError(EXPR_TYPE_ERROR)
             aggs_exprs.append(agg.expr)
         return DataFrame(self.df.aggregate(group_by_exprs, aggs_exprs))
 
@@ -779,7 +779,7 @@ def join_on(
         exprs = []
         for expr in on_exprs:
             if not isinstance(expr, Expr):
-                raise TypeError(_EXPR_TYPE_ERROR)
+                raise TypeError(EXPR_TYPE_ERROR)
             exprs.append(expr.expr)
         return DataFrame(self.df.join_on(right.df, exprs, how))
 

python/datafusion/expr.py

@@ -41,7 +41,7 @@
 
 
 # Standard error message for invalid expression types
-_EXPR_TYPE_ERROR = "Use col() or lit() to construct expressions"
+EXPR_TYPE_ERROR = "Use col() or lit() to construct expressions"
 
 # The following are imported from the internal representation. We may choose to
 # give these all proper wrappers, or to simply leave as is. These were added
@@ -236,7 +236,7 @@ def expr_list_to_raw_expr_list(
         else:
             error = (
                 "Expected Expr or column name, found:"
-                f" {type(e).__name__}. {_EXPR_TYPE_ERROR}."
+                f" {type(e).__name__}. {EXPR_TYPE_ERROR}."
             )
             raise TypeError(error)
     return raw_exprs
@@ -266,7 +266,7 @@ def sort_list_to_raw_sort_list(
         else:
             error = (
                 "Expected Expr or column name, found:"
-                f" {type(item).__name__}. {_EXPR_TYPE_ERROR}."
+                f" {type(item).__name__}. {EXPR_TYPE_ERROR}."
             )
             raise TypeError(error)
         raw_sort_list.append(sort_or_default(expr_obj))