Skip to content

Commit c84c799

Browse files
committed
Make sys.implementation more compatible with CPython
1 parent 8e9bfe0 commit c84c799

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_sys.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
*graalpython.lib-python.3.test.test_sys.SysModuleTest.test_dlopenflags
1919
*graalpython.lib-python.3.test.test_sys.SysModuleTest.test_executable
2020
*graalpython.lib-python.3.test.test_sys.SysModuleTest.test_exit
21+
*graalpython.lib-python.3.test.test_sys.SysModuleTest.test_implementation
2122
*graalpython.lib-python.3.test.test_sys.SysModuleTest.test_getallocatedblocks
2223
*graalpython.lib-python.3.test.test_sys.SysModuleTest.test_getandroidapilevel
2324
*graalpython.lib-python.3.test.test_sys.SysModuleTest.test_getdefaultencoding

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ public final class PythonLanguage extends TruffleLanguage<PythonContext> {
119119
public static final int MAJOR = 3;
120120
public static final int MINOR = 8;
121121
public static final int MICRO = 5;
122+
// Note: update hexversion in sys.py when updating release level
123+
public static final String RELEASE_LEVEL = "alpha";
122124
public static final String VERSION = MAJOR + "." + MINOR + "." + MICRO;
123125

124126
public static final String MIME_TYPE = "text/x-python";

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SysModuleBuiltins.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public void initialize(PythonCore core) {
146146
builtinConstants.put("path", core.factory().createList());
147147
builtinConstants.put("builtin_module_names", core.factory().createTuple(core.builtinModuleNames()));
148148
builtinConstants.put("maxsize", MAXSIZE);
149-
builtinConstants.put("version_info", core.factory().createTuple(new Object[]{PythonLanguage.MAJOR, PythonLanguage.MINOR, PythonLanguage.MICRO, "dev", 0}));
149+
builtinConstants.put("version_info", core.factory().createTuple(new Object[]{PythonLanguage.MAJOR, PythonLanguage.MINOR, PythonLanguage.MICRO, PythonLanguage.RELEASE_LEVEL, 0}));
150150
builtinConstants.put("version", PythonLanguage.VERSION +
151151
" (" + COMPILE_TIME + ")" +
152152
"\n[Graal, " + Truffle.getRuntime().getName() + ", Java " + System.getProperty("java.version") + "]");

graalpython/lib-graalpython/sys.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def make_implementation_info():
5656
del make_implementation_info
5757
del __gmultiarch
5858
version_info = implementation.version
59-
hexversion = ((version_info.major << 24) |
59+
implementation.hexversion = hexversion = ((version_info.major << 24) |
6060
(version_info.minor << 16) |
6161
(version_info.micro << 8) |
6262
(0xa << 4) | # 0xA is alpha, 0xB is beta, 0xC is rc, 0xF is final

0 commit comments

Comments
 (0)