Skip to content

Commit b423866

Browse files
committed
- copy VirtualFileSystem into o.g.p.embedding.vfs package
- deprecate o.g.p.embedding.utils.VirtualFileSystem (to be removed later)
1 parent 4a51452 commit b423866

File tree

7 files changed

+766
-5
lines changed

7 files changed

+766
-5
lines changed

graalpython/com.oracle.graal.python.test.integration/src/org/graalvm/python/embedding/utils/test/VirtualFileSystemTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
import org.graalvm.polyglot.HostAccess;
5757
import org.graalvm.polyglot.PolyglotAccess;
5858
import org.graalvm.polyglot.io.IOAccess;
59-
import org.graalvm.python.embedding.utils.VirtualFileSystem;
59+
import org.graalvm.python.embedding.vfs.VirtualFileSystem;
6060
import org.junit.Test;
6161

6262
public class VirtualFileSystemTest {

graalpython/graalpy-archetype-polyglot-app/src/main/resources/archetype-resources/src/main/java/GraalPy.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2023, 2024, 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
@@ -51,7 +51,7 @@
5151
import org.graalvm.polyglot.Value;
5252
import org.graalvm.polyglot.io.IOAccess;
5353
import java.io.IOException;
54-
import org.graalvm.python.embedding.utils.VirtualFileSystem;
54+
import org.graalvm.python.embedding.vfs.VirtualFileSystem;
5555

5656
public class GraalPy {
5757
private static final String VENV_PREFIX = "/vfs/venv";

graalpython/graalpy-jbang/examples/hello.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
import org.graalvm.polyglot.PolyglotAccess;
5151
import org.graalvm.polyglot.PolyglotException;
5252
import org.graalvm.polyglot.io.IOAccess;
53-
import org.graalvm.python.embedding.utils.VirtualFileSystem;
53+
import org.graalvm.python.embedding.vfs.VirtualFileSystem;
5454

5555
public class hello {
5656
public static void main(String[] args) {

graalpython/lib-graalpython/modules/standalone/resources/Py2BinLauncher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
import org.graalvm.polyglot.PolyglotException;
4848
import org.graalvm.polyglot.Source;
4949
import org.graalvm.polyglot.io.IOAccess;
50-
import org.graalvm.python.embedding.utils.VirtualFileSystem;
50+
import org.graalvm.python.embedding.vfs.VirtualFileSystem;
5151

5252
/**
5353
* A simple launcher for Python. The launcher sets the filesystem up to read the Python core,

graalpython/org.graalvm.python.embedding/src/org/graalvm/python/embedding/utils/VirtualFileSystem.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@
7676

7777
import org.graalvm.polyglot.io.FileSystem;
7878

79+
@Deprecated(since = "24.1.0")
80+
/**
81+
* @deprecated use org.graalvm.python.embedding.vfs.VirtualFileSystem instead
82+
*/
7983
public final class VirtualFileSystem implements FileSystem, AutoCloseable {
8084
public static enum HostIO {
8185
NONE,

0 commit comments

Comments
 (0)