From 90bfd75d6b4a6f75ef8d1afc73a64a0a3933f08b Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Tue, 13 Jun 2023 13:06:26 +0000 Subject: [PATCH] Support Python 3.8.10. Redshell unfortunately uses this old version, while the union operator for dictionaries was only added in Python 3.9. Test: Ran cargo2android.py on a crate with variants Change-Id: I7a875acde11c23a3b789ef384f3ab32100d7c6d5 --- scripts/cargo2android.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cargo2android.py b/scripts/cargo2android.py index 3918b48b1..669b4dac4 100755 --- a/scripts/cargo2android.py +++ b/scripts/cargo2android.py @@ -1339,7 +1339,7 @@ class Runner(object): # Resolve - and _ for Namespace usage variant_data = {k.replace('-', '_') : v for k, v in self.args.variants[variant_num].items()} # Merge and overwrite variant args - self.variant_args = argparse.Namespace(**vars(self.args) | variant_data) + self.variant_args = argparse.Namespace(**{**vars(self.args), **variant_data}) # Default action is cargo clean, followed by build or user given actions. if self.variant_args.cargo: