From 58c5a33bda2763c68b57abb97f1ccfbfc199cabe Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Thu, 24 Aug 2023 23:35:36 +0000 Subject: Fix python 3.11 compatibility This was fixed upstream in: https://github.com/nanopb/nanopb/commit/d2068ad9094ed5e249141056ba34e0a7d994ef50 https://github.com/nanopb/nanopb/commit/01e9186a8b8b9856d2438ee2886f3464b9a79f88 But we're still on the 0.3 branch, so backport these open() changes. Bug: 278602456 Change-Id: Ie9c3d1e3540d6f8373dfd96fd8e1cc41913bdbae Test: treehugger --- generator/nanopb_generator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generator/nanopb_generator.py b/generator/nanopb_generator.py index b4f1d83..d145dd3 100755 --- a/generator/nanopb_generator.py +++ b/generator/nanopb_generator.py @@ -1641,7 +1641,7 @@ def parse_file(filename, fdesc, options): optfilename = os.path.join(p, optfilename) if options.verbose: sys.stderr.write('Reading options from ' + optfilename + '\n') - Globals.separate_options = read_options_file(open(optfilename, "rU")) + Globals.separate_options = read_options_file(open(optfilename, 'r', encoding = 'utf-8')) break else: # If we are given a full filename and it does not exist, give an error. -- cgit v1.2.3