Skip to content

Commit 7b65335

Browse files
committed
[GR-47073] Improve compatibility with package protobuf
PullRequest: graalpython/2863
2 parents 0a55c46 + 3745a88 commit 7b65335

File tree

2 files changed

+25
-0
lines changed

2 files changed

+25
-0
lines changed
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From 770b2382d9718b3d660998aad25b866bcb9769a6 Mon Sep 17 00:00:00 2001
2+
From: Mohaned Qunaibit <[email protected]>
3+
Date: Fri, 23 Jun 2023 04:52:08 +0300
4+
Subject: [PATCH] patch
5+
6+
---
7+
python/google/protobuf/internal/well_known_types_test.py | 1 +
8+
1 file changed, 1 insertion(+)
9+
10+
diff --git a/python/google/protobuf/internal/well_known_types_test.py b/python/google/protobuf/internal/well_known_types_test.py
11+
index a32459a9e..7ebb733d2 100644
12+
--- a/python/google/protobuf/internal/well_known_types_test.py
13+
+++ b/python/google/protobuf/internal/well_known_types_test.py
14+
@@ -51,6 +51,7 @@ from google.protobuf import text_format
15+
from google.protobuf.internal import _parameterized
16+
17+
try:
18+
+ raise ImportError # not implemented yet in GraalPy
19+
# New module in Python 3.9:
20+
import zoneinfo # pylint:disable=g-import-not-at-top
21+
_TZ_JAPAN = zoneinfo.ZoneInfo('Japan')
22+
--
23+
2.25.1
24+

mx.graalpython/mx_graalpython.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1938,6 +1938,7 @@ def _python_checkpatchfiles():
19381938
"MIT",
19391939
"BSD",
19401940
"BSD-3-Clause",
1941+
"3-Clause BSD License",
19411942
"Apache License, Version 2.0",
19421943
"PSF",
19431944
"Apache",

0 commit comments

Comments
 (0)