diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2023-08-25 03:26:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-08-25 03:26:24 +0000 |
| commit | 9b18ec1e49a3094a26f7ac365db6b18141284d25 (patch) | |
| tree | 7e220299c48092e09a609f176e26b5befbd50f42 | |
| parent | 2a413cbc07fe27b4daf3f04f44efe3102e221b50 (diff) | |
| parent | 58c5a33bda2763c68b57abb97f1ccfbfc199cabe (diff) | |
| download | nanopb-c-9b18ec1e49a3094a26f7ac365db6b18141284d25.tar.gz | |
Fix python 3.11 compatibility am: 58c5a33bda
Original change: https://android-review.googlesource.com/c/platform/external/nanopb-c/+/2726973
Change-Id: I9cb3f2316ea88ae7fcecefeddfecca83ed1a27f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rwxr-xr-x | generator/nanopb_generator.py | 2 |
1 files changed, 1 insertions, 1 deletions
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. |