Enable ssl by default for linux/macos

youknowone · youknowone · commit 9c14e673f139 · 2023-02-25T17:15:43.000+09:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -152,7 +152,7 @@ jobs:
           target: aarch64-apple-darwin
         if: runner.os == 'macOS'
       - name: Check compilation for Apple Silicon
-        run: cargo check --target aarch64-apple-darwin
+        run: cargo check --target aarch64-apple-darwin --features=ssl-vendor
         if: runner.os == 'macOS'
       - name: prepare iOS build
         uses: dtolnay/rust-toolchain@stable
@@ -183,7 +183,7 @@ jobs:
       - name: Install gcc-multilib and musl-tools
         run: sudo apt-get update && sudo apt-get install gcc-multilib musl-tools
       - name: Check compilation for x86 32bit
-        run: cargo check --target i686-unknown-linux-gnu
+        run: cargo check --target i686-unknown-linux-gnu --features=ssl-vendor
 
       - uses: dtolnay/rust-toolchain@stable
         with:
@@ -197,7 +197,7 @@ jobs:
           target: i686-unknown-linux-musl
 
       - name: Check compilation for musl
-        run: cargo check --target i686-unknown-linux-musl
+        run: cargo check --target i686-unknown-linux-musl --features=ssl-vendor
 
       - uses: dtolnay/rust-toolchain@stable
         with:
diff --git a/Cargo.toml b/Cargo.toml
@@ -75,7 +75,6 @@ ssl-vendor = ["rustpython-stdlib/ssl-vendor"]
 rustpython-compiler = { path = "compiler", version = "0.2.0" }
 rustpython-parser = { path = "compiler/parser", version = "0.2.0" }
 rustpython-pylib = { path = "pylib", optional = true, default-features = false }
-rustpython-stdlib = { path = "stdlib", optional = true, default-features = false }
 rustpython-vm = { path = "vm", version = "0.2.0", default-features = false, features = ["compiler"] }
 
 atty = { workspace = true }
@@ -88,6 +87,12 @@ dirs = { package = "dirs-next", version = "2.0.0" }
 env_logger = { version = "0.9.0", default-features = false, features = ["atty", "termcolor"] }
 flamescope = { version = "0.1.2", optional = true }
 
+[target.'cfg(any(target_os = "linux", target_os = "macos"))'.dependencies]
+rustpython-stdlib = {path = "stdlib", optional = true, default-features = false, features = ["ssl"]}
+
+[target.'cfg(not(any(target_os = "linux", target_os = "macos")))'.dependencies]
+rustpython-stdlib = {path = "stdlib", optional = true, default-features = false}
+
 [target.'cfg(windows)'.dependencies]
 libc = { workspace = true }
 
diff --git a/src/lib.rs b/src/lib.rs
@@ -113,7 +113,6 @@ fn setup_main_module(vm: &VirtualMachine) -> PyResult<Scope> {
     Ok(scope)
 }
 
-#[cfg(feature = "ssl")]
 fn get_pip(scope: Scope, vm: &VirtualMachine) -> PyResult<()> {
     let get_getpip = rustpython_vm::py_compile!(
         source = r#"\
@@ -133,26 +132,23 @@ __import__("io").TextIOWrapper(
     Ok(())
 }
 
-#[cfg(feature = "ssl")]
 fn ensurepip(_: Scope, vm: &VirtualMachine) -> PyResult<()> {
     vm.run_module("ensurepip")
 }
 
 fn install_pip(_installer: &str, _scope: Scope, vm: &VirtualMachine) -> PyResult<()> {
-    #[cfg(feature = "ssl")]
-    {
+    if vm.state.module_inits.contains_key("_ssl") {
         match _installer {
             "ensurepip" => ensurepip(_scope, vm),
             "get-pip" => get_pip(_scope, vm),
             _ => unreachable!(),
         }
+    } else {
+        Err(vm.new_exception_msg(
+            vm.ctx.exceptions.system_error.to_owned(),
+            "install-pip requires rustpython be build with '--features=ssl'".to_owned(),
+        ))
     }
-
-    #[cfg(not(feature = "ssl"))]
-    Err(vm.new_exception_msg(
-        vm.ctx.exceptions.system_error.to_owned(),
-        "install-pip requires rustpython be build with '--features=ssl'".to_owned(),
-    ))
 }
 
 fn run_rustpython(vm: &VirtualMachine, run_mode: RunMode, quiet: bool) -> PyResult<()> {
