3
3
"""Top level ``eval`` module.
4
4
"""
5
5
6
- import warnings
7
6
import tokenize
8
7
from pandas .io .formats .printing import pprint_thing
9
8
from pandas .core .computation import _NUMEXPR_INSTALLED
@@ -148,7 +147,7 @@ def _check_for_locals(expr, stack_level, parser):
148
147
149
148
def eval (expr , parser = 'pandas' , engine = None , truediv = True ,
150
149
local_dict = None , global_dict = None , resolvers = (), level = 0 ,
151
- target = None , inplace = None ):
150
+ target = None , inplace = False ):
152
151
"""Evaluate a Python expression as a string using various backends.
153
152
154
153
The following arithmetic operations are supported: ``+``, ``-``, ``*``,
@@ -206,19 +205,26 @@ def eval(expr, parser='pandas', engine=None, truediv=True,
206
205
The number of prior stack frames to traverse and add to the current
207
206
scope. Most users will **not** need to change this parameter.
208
207
target : a target object for assignment, optional, default is None
209
- essentially this is a passed in resolver
210
- inplace : bool, default True
211
- If expression mutates, whether to modify object inplace or return
212
- copy with mutation .
213
-
214
- WARNING: inplace=None currently falls back to to True, but
215
- in a future version, will default to False. Use inplace=True
216
- explicitly rather than relying on the default .
208
+ This is essentially passed into the resolver and is used when there
209
+ is variable assignment in the expression. If so, then `target` must
210
+ support item assignment with string keys, and if a copy is being
211
+ returned, it must also support `.copy()` .
212
+ inplace : bool, default False
213
+ If `target` is provided, and the expression mutates `target`, whether
214
+ to modify `target` inplace. Otherwise, return a copy of `target` with
215
+ the mutation .
217
216
218
217
Returns
219
218
-------
220
219
ndarray, numeric scalar, DataFrame, Series
221
220
221
+ Raises
222
+ ------
223
+ ValueError : 1) A non-None `target` was passed in that does not support
224
+ string item assignment.
225
+ 2) `inplace=False`, and a non-None `target` was passed in
226
+ that does not support `.copy()`.
227
+
222
228
Notes
223
229
-----
224
230
The ``dtype`` of any objects involved in an arithmetic ``%`` operation are
@@ -232,8 +238,9 @@ def eval(expr, parser='pandas', engine=None, truediv=True,
232
238
pandas.DataFrame.query
233
239
pandas.DataFrame.eval
234
240
"""
235
- inplace = validate_bool_kwarg (inplace , 'inplace' )
236
- first_expr = True
241
+
242
+ inplace = validate_bool_kwarg (inplace , "inplace" )
243
+
237
244
if isinstance (expr , string_types ):
238
245
_check_expression (expr )
239
246
exprs = [e .strip () for e in expr .splitlines () if e .strip () != '' ]
@@ -245,7 +252,10 @@ def eval(expr, parser='pandas', engine=None, truediv=True,
245
252
raise ValueError ("multi-line expressions are only valid in the "
246
253
"context of data, use DataFrame.eval" )
247
254
255
+ ret = None
248
256
first_expr = True
257
+ target_modified = False
258
+
249
259
for expr in exprs :
250
260
expr = _convert_expression (expr )
251
261
engine = _check_engine (engine )
@@ -272,22 +282,23 @@ def eval(expr, parser='pandas', engine=None, truediv=True,
272
282
273
283
# assign if needed
274
284
if env .target is not None and parsed_expr .assigner is not None :
275
- if inplace is None :
276
- warnings .warn (
277
- "eval expressions containing an assignment currently"
278
- "default to operating inplace.\n This will change in "
279
- "a future version of pandas, use inplace=True to "
280
- "avoid this warning." ,
281
- FutureWarning , stacklevel = 3 )
282
- inplace = True
285
+ target_modified = True
283
286
284
287
# if returning a copy, copy only on the first assignment
285
288
if not inplace and first_expr :
286
- target = env .target .copy ()
289
+ try :
290
+ target = env .target .copy ()
291
+ except AttributeError :
292
+ raise ValueError ("Cannot return a copy of the target" )
287
293
else :
288
294
target = env .target
289
295
290
- target [parsed_expr .assigner ] = ret
296
+ # TypeError is most commonly raised (e.g. int, list), but you
297
+ # get IndexError if you try to do this assignment on np.ndarray.
298
+ try :
299
+ target [parsed_expr .assigner ] = ret
300
+ except (TypeError , IndexError ):
301
+ raise ValueError ("Cannot assign expression output to target" )
291
302
292
303
if not resolvers :
293
304
resolvers = ({parsed_expr .assigner : ret },)
@@ -304,7 +315,6 @@ def eval(expr, parser='pandas', engine=None, truediv=True,
304
315
ret = None
305
316
first_expr = False
306
317
307
- if not inplace and inplace is not None :
308
- return target
309
-
310
- return ret
318
+ # We want to exclude `inplace=None` as being False.
319
+ if inplace is False :
320
+ return target if target_modified else ret
0 commit comments