Skip to content

Commit 4f3093c

Browse files
committed
Revert "apply changes requested by dimitri"
This reverts commit de73221.
1 parent de73221 commit 4f3093c

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

datajoint/autopopulate.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def populate(self, *restrictions, suppress_errors=False, return_exception_object
108108
:param display_progress: if True, report progress_bar
109109
:param limit: if not None, checks at most that many keys
110110
:param max_calls: if not None, populates at max that many keys
111-
:param make_kwargs: optional dict containing keyword arguments that will be passed down to each make() call
111+
:param kwargs: optional dict containing arguments that will be passed down to each make() call
112112
"""
113113
if self.connection.in_transaction:
114114
raise DataJointError('Populate cannot be called during a transaction.')
@@ -151,7 +151,10 @@ def handler(signum, frame):
151151
call_count += 1
152152
self.__class__._allow_insert = True
153153
try:
154-
make(dict(key), **(make_kwargs or {}))
154+
if make_kwargs is not None:
155+
make(dict(key), **make_kwargs)
156+
else:
157+
make(dict(key))
155158
except (KeyboardInterrupt, SystemExit, Exception) as error:
156159
try:
157160
self.connection.cancel_transaction()

0 commit comments

Comments
 (0)