From b53d4a7ea5c3963e16727aafdbda01771af04c0d Mon Sep 17 00:00:00 2001 From: MaxThevenet Date: Tue, 11 Dec 2018 10:37:21 -0800 Subject: fix conflicts for merge revert --- Python/pywarpx/WarpX.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Python/pywarpx/WarpX.py') diff --git a/Python/pywarpx/WarpX.py b/Python/pywarpx/WarpX.py index f58d4f111..9c4a4b380 100644 --- a/Python/pywarpx/WarpX.py +++ b/Python/pywarpx/WarpX.py @@ -70,7 +70,7 @@ class WarpX(Bucket): argv = self.create_argv_list() with open(filename, 'w') as ff: - for k, v in kw.items(): + for k, v in kw.iteritems(): ff.write('{0} = {1}\n'.format(k, v)) for arg in argv: -- cgit v1.2.3