58
58
59
59
import com .oracle .graal .python .nodes .attributes .ReadAttributeFromPythonObjectNode ;
60
60
import com .oracle .graal .python .nodes .attributes .WriteAttributeToPythonObjectNode ;
61
+ import com .oracle .graal .python .runtime .PythonImageBuildOptions ;
61
62
import org .graalvm .nativeimage .ImageInfo ;
62
63
63
64
import com .oracle .graal .python .PythonLanguage ;
@@ -625,10 +626,10 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed,
625
626
new JSONModuleBuiltins (),
626
627
new SREModuleBuiltins (),
627
628
new AstModuleBuiltins (),
628
- PythonOptions .WITHOUT_NATIVE_POSIX && (PythonOptions .WITHOUT_JAVA_INET || !socketIOAllowed ) ? null : new SelectModuleBuiltins (),
629
- PythonOptions .WITHOUT_NATIVE_POSIX && (PythonOptions .WITHOUT_JAVA_INET || !socketIOAllowed ) ? null : new SocketModuleBuiltins (),
630
- PythonOptions .WITHOUT_NATIVE_POSIX && (PythonOptions .WITHOUT_JAVA_INET || !socketIOAllowed ) ? null : new SocketBuiltins (),
631
- PythonOptions .WITHOUT_PLATFORM_ACCESS ? null : new SignalModuleBuiltins (),
629
+ PythonImageBuildOptions .WITHOUT_NATIVE_POSIX && (PythonImageBuildOptions .WITHOUT_JAVA_INET || !socketIOAllowed ) ? null : new SelectModuleBuiltins (),
630
+ PythonImageBuildOptions .WITHOUT_NATIVE_POSIX && (PythonImageBuildOptions .WITHOUT_JAVA_INET || !socketIOAllowed ) ? null : new SocketModuleBuiltins (),
631
+ PythonImageBuildOptions .WITHOUT_NATIVE_POSIX && (PythonImageBuildOptions .WITHOUT_JAVA_INET || !socketIOAllowed ) ? null : new SocketBuiltins (),
632
+ PythonImageBuildOptions .WITHOUT_PLATFORM_ACCESS ? null : new SignalModuleBuiltins (),
632
633
new TracebackBuiltins (),
633
634
new GcModuleBuiltins (),
634
635
new AtexitModuleBuiltins (),
@@ -638,30 +639,30 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed,
638
639
new SysModuleBuiltins (),
639
640
new MemoryViewBuiltins (),
640
641
new SuperBuiltins (),
641
- PythonOptions .WITHOUT_SSL ? null : new SSLModuleBuiltins (),
642
- PythonOptions .WITHOUT_SSL ? null : new SSLContextBuiltins (),
643
- PythonOptions .WITHOUT_SSL ? null : new SSLErrorBuiltins (),
644
- PythonOptions .WITHOUT_SSL ? null : new SSLSocketBuiltins (),
645
- PythonOptions .WITHOUT_SSL ? null : new MemoryBIOBuiltins (),
642
+ PythonImageBuildOptions .WITHOUT_SSL ? null : new SSLModuleBuiltins (),
643
+ PythonImageBuildOptions .WITHOUT_SSL ? null : new SSLContextBuiltins (),
644
+ PythonImageBuildOptions .WITHOUT_SSL ? null : new SSLErrorBuiltins (),
645
+ PythonImageBuildOptions .WITHOUT_SSL ? null : new SSLSocketBuiltins (),
646
+ PythonImageBuildOptions .WITHOUT_SSL ? null : new MemoryBIOBuiltins (),
646
647
new BinasciiModuleBuiltins (),
647
648
new PosixShMemModuleBuiltins (),
648
- PythonOptions .WITHOUT_PLATFORM_ACCESS ? null : new PosixSubprocessModuleBuiltins (),
649
+ PythonImageBuildOptions .WITHOUT_PLATFORM_ACCESS ? null : new PosixSubprocessModuleBuiltins (),
649
650
new ReadlineModuleBuiltins (),
650
651
new OperatorModuleBuiltins (),
651
652
652
653
// hashlib
653
- PythonOptions .WITHOUT_DIGEST ? null : new Md5ModuleBuiltins (),
654
- PythonOptions .WITHOUT_DIGEST ? null : new Sha1ModuleBuiltins (),
655
- PythonOptions .WITHOUT_DIGEST ? null : new Sha256ModuleBuiltins (),
656
- PythonOptions .WITHOUT_DIGEST ? null : new Sha512ModuleBuiltins (),
657
- PythonOptions .WITHOUT_DIGEST ? null : new Sha3ModuleBuiltins (),
658
- PythonOptions .WITHOUT_DIGEST ? null : new Blake2ModuleBuiltins (),
659
- PythonOptions .WITHOUT_DIGEST ? null : new DigestObjectBuiltins (),
660
- PythonOptions .WITHOUT_DIGEST ? null : new HashObjectBuiltins (),
661
- PythonOptions .WITHOUT_DIGEST ? null : new ShakeDigestObjectBuiltins (),
662
- PythonOptions .WITHOUT_DIGEST ? null : new Blake2bObjectBuiltins (),
663
- PythonOptions .WITHOUT_DIGEST ? null : new Blake2sObjectBuiltins (),
664
- PythonOptions .WITHOUT_DIGEST ? null : new HashlibModuleBuiltins (),
654
+ PythonImageBuildOptions .WITHOUT_DIGEST ? null : new Md5ModuleBuiltins (),
655
+ PythonImageBuildOptions .WITHOUT_DIGEST ? null : new Sha1ModuleBuiltins (),
656
+ PythonImageBuildOptions .WITHOUT_DIGEST ? null : new Sha256ModuleBuiltins (),
657
+ PythonImageBuildOptions .WITHOUT_DIGEST ? null : new Sha512ModuleBuiltins (),
658
+ PythonImageBuildOptions .WITHOUT_DIGEST ? null : new Sha3ModuleBuiltins (),
659
+ PythonImageBuildOptions .WITHOUT_DIGEST ? null : new Blake2ModuleBuiltins (),
660
+ PythonImageBuildOptions .WITHOUT_DIGEST ? null : new DigestObjectBuiltins (),
661
+ PythonImageBuildOptions .WITHOUT_DIGEST ? null : new HashObjectBuiltins (),
662
+ PythonImageBuildOptions .WITHOUT_DIGEST ? null : new ShakeDigestObjectBuiltins (),
663
+ PythonImageBuildOptions .WITHOUT_DIGEST ? null : new Blake2bObjectBuiltins (),
664
+ PythonImageBuildOptions .WITHOUT_DIGEST ? null : new Blake2sObjectBuiltins (),
665
+ PythonImageBuildOptions .WITHOUT_DIGEST ? null : new HashlibModuleBuiltins (),
665
666
666
667
new PyExpatModuleBuiltins (),
667
668
@@ -688,9 +689,9 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed,
688
689
new ZipLongestBuiltins (),
689
690
690
691
// zlib
691
- PythonOptions .WITHOUT_COMPRESSION_LIBRARIES ? null : new ZLibModuleBuiltins (),
692
- PythonOptions .WITHOUT_COMPRESSION_LIBRARIES ? null : new ZlibCompressBuiltins (),
693
- PythonOptions .WITHOUT_COMPRESSION_LIBRARIES ? null : new ZlibDecompressBuiltins (),
692
+ PythonImageBuildOptions .WITHOUT_COMPRESSION_LIBRARIES ? null : new ZLibModuleBuiltins (),
693
+ PythonImageBuildOptions .WITHOUT_COMPRESSION_LIBRARIES ? null : new ZlibCompressBuiltins (),
694
+ PythonImageBuildOptions .WITHOUT_COMPRESSION_LIBRARIES ? null : new ZlibDecompressBuiltins (),
694
695
695
696
new MMapModuleBuiltins (),
696
697
new FcntlModuleBuiltins (),
@@ -715,13 +716,13 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed,
715
716
new UnpicklerMemoProxyBuiltins (),
716
717
717
718
// lzma
718
- PythonOptions .WITHOUT_COMPRESSION_LIBRARIES ? null : new LZMAModuleBuiltins (),
719
- PythonOptions .WITHOUT_COMPRESSION_LIBRARIES ? null : new LZMACompressorBuiltins (),
720
- PythonOptions .WITHOUT_COMPRESSION_LIBRARIES ? null : new LZMADecompressorBuiltins (),
719
+ PythonImageBuildOptions .WITHOUT_COMPRESSION_LIBRARIES ? null : new LZMAModuleBuiltins (),
720
+ PythonImageBuildOptions .WITHOUT_COMPRESSION_LIBRARIES ? null : new LZMACompressorBuiltins (),
721
+ PythonImageBuildOptions .WITHOUT_COMPRESSION_LIBRARIES ? null : new LZMADecompressorBuiltins (),
721
722
722
723
// _multiprocessing
723
- PythonOptions .WITHOUT_NATIVE_POSIX ? null : new MultiprocessingModuleBuiltins (),
724
- PythonOptions .WITHOUT_NATIVE_POSIX ? null : new SemLockBuiltins (),
724
+ PythonImageBuildOptions .WITHOUT_NATIVE_POSIX ? null : new MultiprocessingModuleBuiltins (),
725
+ PythonImageBuildOptions .WITHOUT_NATIVE_POSIX ? null : new SemLockBuiltins (),
725
726
new MultiprocessingGraalPyModuleBuiltins (),
726
727
new GraalPySemLockBuiltins (),
727
728
@@ -775,7 +776,7 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed,
775
776
builtins .add (new LsprofModuleBuiltins ());
776
777
builtins .add (LsprofModuleBuiltins .newProfilerBuiltins ());
777
778
}
778
- if (!PythonOptions .WITHOUT_COMPRESSION_LIBRARIES && (nativeAccessAllowed || ImageInfo .inImageBuildtimeCode ())) {
779
+ if (!PythonImageBuildOptions .WITHOUT_COMPRESSION_LIBRARIES && (nativeAccessAllowed || ImageInfo .inImageBuildtimeCode ())) {
779
780
builtins .add (new BZ2CompressorBuiltins ());
780
781
builtins .add (new BZ2DecompressorBuiltins ());
781
782
builtins .add (new BZ2ModuleBuiltins ());
@@ -939,7 +940,7 @@ private void initializeImportlib() {
939
940
940
941
// see CPython's init_importlib_external
941
942
callNode .execute (null , null , bootstrap , toTruffleStringUncached ("_install_external_importers" ));
942
- if (!PythonOptions .WITHOUT_COMPRESSION_LIBRARIES ) {
943
+ if (!PythonImageBuildOptions .WITHOUT_COMPRESSION_LIBRARIES ) {
943
944
// see CPython's _PyImportZip_Init
944
945
Object pathHooks = readNode .execute (sysModule , toTruffleStringUncached ("path_hooks" ));
945
946
if (!(pathHooks instanceof PList pathHooksList )) {
@@ -1001,7 +1002,7 @@ public final void postInitialize() {
1001
1002
* would never include the intrinsified _bz2 module in the native image since native
1002
1003
* access is never allowed during native image build time.
1003
1004
*/
1004
- if (!PythonOptions .WITHOUT_COMPRESSION_LIBRARIES && ImageInfo .inImageCode () && !getContext ().isNativeAccessAllowed ()) {
1005
+ if (!PythonImageBuildOptions .WITHOUT_COMPRESSION_LIBRARIES && ImageInfo .inImageCode () && !getContext ().isNativeAccessAllowed ()) {
1005
1006
removeBuiltinModule (BuiltinNames .T_BZ2 );
1006
1007
}
1007
1008
0 commit comments