Skip to content

Commit 2455329

Browse files
committed
fix reduce_newobj
1 parent 0f903bc commit 2455329

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

graalpython/lib-graalpython/object.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,9 @@ def reduce_newobj(obj):
7474
args, kwargs = _get_new_arguments(obj)
7575
import_copyreg()
7676

77-
hasargs = args is not None
7877
if kwargs is None or len(kwargs) == 0:
7978
newobj = copyreg.__newobj__
80-
newargs = (cls, ) + args if args else tuple()
79+
newargs = (cls, ) + (args if args else tuple())
8180
elif args is not None:
8281
newobj = copyreg.__newobj_ex__
8382
newargs = (cls, args, kwargs)
@@ -92,7 +91,7 @@ def reduce_newobj(obj):
9291
getstate = obj.__getstate__
9392
except AttributeError:
9493
state = getattr(obj, "__dict__", None)
95-
names = slotnames(cls) # not checking for list
94+
names = slotnames(cls) # not checking for list
9695
if names is not None:
9796
slots = {}
9897
for name in names:
@@ -107,7 +106,7 @@ def reduce_newobj(obj):
107106
else:
108107
state = getstate()
109108
listitems = iter(obj) if isinstance(obj, list) else None
110-
dictitems = obj.iteritems() if isinstance(obj, dict) else None
109+
dictitems = iter(obj.items()) if isinstance(obj, dict) else None
111110

112111
return newobj, newargs, state, listitems, dictitems
113112

0 commit comments

Comments
 (0)