Skip to content

Commit a16dffc

Browse files
committed
Fix uname system name capitalization in emulated backend
Fixes #486
1 parent 3cd7cfd commit a16dffc

File tree

2 files changed

+18
-12
lines changed

2 files changed

+18
-12
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/PythonOS.java

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -45,25 +45,31 @@
4545
import com.oracle.truffle.api.strings.TruffleString;
4646

4747
public enum PythonOS {
48-
PLATFORM_JAVA("java"),
49-
PLATFORM_CYGWIN("cygwin"),
50-
PLATFORM_LINUX("linux"),
51-
PLATFORM_DARWIN("darwin"),
52-
PLATFORM_WIN32("win32"),
53-
PLATFORM_SUNOS("sunos"),
54-
PLATFORM_FREEBSD("freebsd"),
55-
PLATFORM_ANY(null);
48+
PLATFORM_JAVA("java", "Java"),
49+
PLATFORM_CYGWIN("cygwin", "CYGWIN"),
50+
PLATFORM_LINUX("linux", "Linux"),
51+
PLATFORM_DARWIN("darwin", "Darwin"),
52+
PLATFORM_WIN32("win32", "Windows"),
53+
PLATFORM_SUNOS("sunos", "SunOS"),
54+
PLATFORM_FREEBSD("freebsd", "FreeBSD"),
55+
PLATFORM_ANY(null, null);
5656

5757
private final TruffleString name;
58+
private final TruffleString uname;
5859

59-
PythonOS(String name) {
60+
PythonOS(String name, String uname) {
6061
this.name = toTruffleStringUncached(name);
62+
this.uname = toTruffleStringUncached(uname);
6163
}
6264

6365
public TruffleString getName() {
6466
return name;
6567
}
6668

69+
public TruffleString getUname() {
70+
return uname;
71+
}
72+
6773
private static final PythonOS current;
6874

6975
static {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/EmulatedPosixSupport.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,6 @@
210210
import java.util.concurrent.TimeUnit;
211211
import java.util.logging.Level;
212212

213-
import com.oracle.truffle.api.TruffleOptions;
214213
import org.graalvm.nativeimage.ImageInfo;
215214
import org.graalvm.nativeimage.ProcessProperties;
216215
import org.graalvm.polyglot.io.ProcessHandler.Redirect;
@@ -252,6 +251,7 @@
252251
import com.oracle.truffle.api.TruffleLanguage;
253252
import com.oracle.truffle.api.TruffleLanguage.Env;
254253
import com.oracle.truffle.api.TruffleLogger;
254+
import com.oracle.truffle.api.TruffleOptions;
255255
import com.oracle.truffle.api.TruffleSafepoint;
256256
import com.oracle.truffle.api.dsl.Bind;
257257
import com.oracle.truffle.api.dsl.Cached;
@@ -1290,7 +1290,7 @@ private static int posixPermissionsToMode(int inputMode, final Set<PosixFilePerm
12901290
@SuppressWarnings("static-method")
12911291
public Object[] uname(
12921292
@Shared("js2ts") @Cached TruffleString.FromJavaStringNode fromJavaStringNode) {
1293-
return new Object[]{getPythonOS().getName(), fromJavaStringNode.execute(getHostName(withoutIOSocket), TS_ENCODING),
1293+
return new Object[]{getPythonOS().getUname(), fromJavaStringNode.execute(getHostName(withoutIOSocket), TS_ENCODING),
12941294
fromJavaStringNode.execute(getOsVersion(), TS_ENCODING), T_EMPTY_STRING, PythonUtils.getPythonArch()};
12951295
}
12961296

0 commit comments

Comments
 (0)