From 9046a1d2c46fac6fbd7809d67e3b11bd99e72e93 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Thu, 25 Jul 2019 18:09:59 -0700 Subject: [PATCH] Make merge_opt_params compatible with Python 3 --- s4cmd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/s4cmd.py b/s4cmd.py index b12a57b..ac99d57 100755 --- a/s4cmd.py +++ b/s4cmd.py @@ -429,7 +429,7 @@ def merge_opt_params(self, method, kargs): if key in kargs and type(kargs[key]) == dict: assert(type(getattr(self.opt, key)) == dict) # Merge two dictionaries. - for k, v in getattr(self.opt, key).iteritems(): + for k, v in getattr(self.opt, key).items(): kargs[key][k] = v else: # Overwrite values.