aboutsummaryrefslogtreecommitdiff
path: root/Python/pywarpx/WarpX.py
diff options
context:
space:
mode:
authorGravatar MaxThevenet <mthevenet@lbl.gov> 2018-12-11 10:37:21 -0800
committerGravatar MaxThevenet <mthevenet@lbl.gov> 2018-12-11 10:37:21 -0800
commitb53d4a7ea5c3963e16727aafdbda01771af04c0d (patch)
tree33ddccf2ceb4ae6670baa4ed31b9b97cb7035473 /Python/pywarpx/WarpX.py
parent4e4a84aba36b2d2168cf41077f596549180f0dd9 (diff)
downloadWarpX-b53d4a7ea5c3963e16727aafdbda01771af04c0d.tar.gz
WarpX-b53d4a7ea5c3963e16727aafdbda01771af04c0d.tar.zst
WarpX-b53d4a7ea5c3963e16727aafdbda01771af04c0d.zip
fix conflicts for merge revert
Diffstat (limited to 'Python/pywarpx/WarpX.py')
-rw-r--r--Python/pywarpx/WarpX.py2
1 files changed, 1 insertions, 1 deletions
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: