From f9b6dfd919f5ab2da8411e4d0fab3caf5ef7ad34 Mon Sep 17 00:00:00 2001 From: Mathieu Bridon Date: Wed, 27 Jun 2018 12:37:39 +0200 Subject: [PATCH] python: Specify the JSON separators On Python 2, the default JSON separators are ', ' for items and ': ' for dicts. On Python 3, the default is the same when no indent is specified, but if one is (and we do specify one) then the default items separator becomes ',' (the dict separator remains unchanged). This change explicitly specifies the Python 3 default, which helps ensuring that the output is identical, whether it was generated by Python 2 or 3. Reviewed-by: Eric Engestrom --- src/amd/vulkan/radv_icd.py | 2 +- src/intel/vulkan/anv_icd.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/amd/vulkan/radv_icd.py b/src/amd/vulkan/radv_icd.py index 78ed379bd22..cc86bbfa56c 100644 --- a/src/amd/vulkan/radv_icd.py +++ b/src/amd/vulkan/radv_icd.py @@ -44,4 +44,4 @@ if __name__ == '__main__': } with open(args.out, 'w') as f: - json.dump(json_data, f, indent = 4, sort_keys=True) + json.dump(json_data, f, indent = 4, sort_keys=True, separators=(',', ': ')) diff --git a/src/intel/vulkan/anv_icd.py b/src/intel/vulkan/anv_icd.py index 31bb0687a8f..36c2882f7d6 100644 --- a/src/intel/vulkan/anv_icd.py +++ b/src/intel/vulkan/anv_icd.py @@ -44,4 +44,4 @@ if __name__ == '__main__': } with open(args.out, 'w') as f: - json.dump(json_data, f, indent = 4, sort_keys=True) + json.dump(json_data, f, indent = 4, sort_keys=True, separators=(',', ': ')) -- 2.30.2