Skip to content

REALLY update the demo this time #1198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
windelbouwman merged 19 commits into from
Aug 2, 2019
Merged

REALLY update the demo this time #1198

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
aecb151
builtins: Implement ascii builtin API
corona10 Jul 27, 2019
1024281
Add support for star expression in tuple.
windelbouwman Jul 27, 2019
57ef8b3
Merge pull request #1181 from corona10/builtin_ascii
windelbouwman Jul 28, 2019
50dd93d
Merge pull request #1182 from RustPython/example1
windelbouwman Jul 28, 2019
38d9f40
Implement dictionary indexing by trait.
windelbouwman Jul 28, 2019
4ee80a3
builtin: Fix hex format of ascii
corona10 Jul 28, 2019
42dca44
Implement do_eq for String impl of DictKey. Also move get_item_option…
windelbouwman Jul 28, 2019
c8ce3bd
Merge pull request #1187 from RustPython/dict-keying
coolreader18 Jul 29, 2019
53c653f
Implement several methods - os module
Jul 25, 2019
364ddeb
Fix compilation on Windows
Jul 30, 2019
5bfa4ce
ascii: Improve test
corona10 Jul 31, 2019
fafeed1
ascii: Apply codereview
corona10 Jul 31, 2019
c2ec66f
Merge pull request #1188 from corona10/hex_format
windelbouwman Jul 31, 2019
13d0c07
Merge pull request #1191 from mpajkowski/os_module
coolreader18 Jul 31, 2019
8a85d7e
Add Lib to COPY list (fixes #1195)
coolreader18 Aug 1, 2019
0f4c2c1
byte.decode
Jun 23, 2019
a0f12c3
Fix deployment
coolreader18 Aug 1, 2019
6d285a7
Merge pull request #1193 from yanganto/feat/byte-decode
coolreader18 Aug 1, 2019
6cc4ebb
Merge pull request #1196 from RustPython/coolreader18/fix-deploy
windelbouwman Aug 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix compilation on Windows
  • Loading branch information
Marcin Pajkowski
Marcin Pajkowski committed Jul 30, 2019
commit 364ddeb6b219abef3329f6d57acd577cb4d48eac
48 changes: 31 additions & 17 deletions vm/src/stdlib/os.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ use std::time::{Duration, SystemTime};
use std::{env, fs};

use bitflags::bitflags;
#[cfg(unix)]
use nix::errno::Errno;
#[cfg(unix)]
use nix::unistd::{self, Gid, Pid, Uid};
use num_traits::cast::ToPrimitive;

Expand Down Expand Up @@ -176,6 +178,7 @@ fn convert_io_error(vm: &VirtualMachine, err: io::Error) -> PyObjectRef {
os_error
}

#[cfg(unix)]
fn convert_nix_error(vm: &VirtualMachine, err: nix::Error) -> PyObjectRef {
let nix_error = match err {
nix::Error::InvalidPath => {
Expand Down Expand Up @@ -204,6 +207,7 @@ fn convert_nix_error(vm: &VirtualMachine, err: nix::Error) -> PyObjectRef {
nix_error
}

#[cfg(unix)]
fn convert_nix_errno(vm: &VirtualMachine, errno: Errno) -> PyClassRef {
match errno {
Errno::EPERM => vm.ctx.exceptions.permission_error.clone(),
Expand Down Expand Up @@ -1000,23 +1004,33 @@ pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {
"supports_follow_symlinks" => supports_follow_symlinks.into_object(),
});

if cfg!(unix) {
extend_module!(vm, module, {
"getppid" => ctx.new_rustfunc(os_getppid),
"getgid" => ctx.new_rustfunc(os_getgid),
"getegid" => ctx.new_rustfunc(os_getegid),
"getpgid" => ctx.new_rustfunc(os_getpgid),
"getsid" => ctx.new_rustfunc(os_getsid),
"getuid" => ctx.new_rustfunc(os_getuid),
"geteuid" => ctx.new_rustfunc(os_geteuid),
"setgid" => ctx.new_rustfunc(os_setgid),
"setegid" => ctx.new_rustfunc(os_setegid),
"setpgid" => ctx.new_rustfunc(os_setpgid),
"setsid" => ctx.new_rustfunc(os_setsid),
"setuid" => ctx.new_rustfunc(os_setuid),
"seteuid" => ctx.new_rustfunc(os_seteuid),
});
}
extend_module_platform_specific(&vm, module)
}

#[cfg(unix)]
fn extend_module_platform_specific(vm: &VirtualMachine, module: PyObjectRef) -> PyObjectRef {
let ctx = &vm.ctx;

extend_module!(vm, module, {
"getppid" => ctx.new_rustfunc(os_getppid),
"getgid" => ctx.new_rustfunc(os_getgid),
"getegid" => ctx.new_rustfunc(os_getegid),
"getpgid" => ctx.new_rustfunc(os_getpgid),
"getsid" => ctx.new_rustfunc(os_getsid),
"getuid" => ctx.new_rustfunc(os_getuid),
"geteuid" => ctx.new_rustfunc(os_geteuid),
"setgid" => ctx.new_rustfunc(os_setgid),
"setegid" => ctx.new_rustfunc(os_setegid),
"setpgid" => ctx.new_rustfunc(os_setpgid),
"setsid" => ctx.new_rustfunc(os_setsid),
"setuid" => ctx.new_rustfunc(os_setuid),
"seteuid" => ctx.new_rustfunc(os_seteuid),
});

module
}

#[cfg(not(unix))]
fn extend_module_platform_specific(_vm: &VirtualMachine, module: PyObjectRef) -> PyObjectRef {
module
}