@@ -368,16 +368,14 @@ def _populate1(self, key, jobs, suppress_errors, return_exception_objects, make_
368368 """
369369 import time
370370
371- # use the legacy `_make_tuples` callback.
372- make = self ._make_tuples if hasattr (self , "_make_tuples" ) else self .make
373371 start_time = time .time ()
374372
375373 # Reserve the job (per-key, before make)
376374 if jobs is not None :
377375 jobs .reserve (key )
378376
379377 # if make is a generator, transaction can be delayed until the final stage
380- is_generator = inspect .isgeneratorfunction (make )
378+ is_generator = inspect .isgeneratorfunction (self . make )
381379 if not is_generator :
382380 self .connection .start_transaction ()
383381
@@ -394,16 +392,16 @@ def _populate1(self, key, jobs, suppress_errors, return_exception_objects, make_
394392
395393 try :
396394 if not is_generator :
397- make (dict (key ), ** (make_kwargs or {}))
395+ self . make (dict (key ), ** (make_kwargs or {}))
398396 else :
399397 # tripartite make - transaction is delayed until the final stage
400- gen = make (dict (key ), ** (make_kwargs or {}))
398+ gen = self . make (dict (key ), ** (make_kwargs or {}))
401399 fetched_data = next (gen )
402400 fetch_hash = deepdiff .DeepHash (fetched_data , ignore_iterable_order = False )[fetched_data ]
403401 computed_result = next (gen ) # perform the computation
404402 # fetch and insert inside a transaction
405403 self .connection .start_transaction ()
406- gen = make (dict (key ), ** (make_kwargs or {})) # restart make
404+ gen = self . make (dict (key ), ** (make_kwargs or {})) # restart make
407405 fetched_data = next (gen )
408406 if (
409407 fetch_hash != deepdiff .DeepHash (fetched_data , ignore_iterable_order = False )[fetched_data ]
0 commit comments