temp

youknowone · youknowone · commit 568f57f06281 · 2019-10-10T01:37:43.000+09:00
diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
@@ -26,7 +26,7 @@
 import logging, socket, os, pickle, struct, time, re
 from stat import ST_DEV, ST_INO, ST_MTIME
 import queue
-import threading
+# import threading
 
 #
 # Some constants...
diff --git a/parser/src/parser.rs b/parser/src/parser.rs
@@ -369,6 +369,31 @@ mod tests {
         )
     }
 
+    #[test]
+    fn test_parse_dict_comprehension() {
+        let source = String::from("{x1: x2 for y in z}");
+        let parse_ast = parse_expression(&source).unwrap();
+        assert_eq!(
+            parse_ast,
+            ast::Expression {
+                location: ast::Location::new(1, 1),
+                node: ast::ExpressionType::Comprehension {
+                    kind: Box::new(ast::ComprehensionKind::Dict {
+                        key: mk_ident("x1", 1, 2),
+                        value: mk_ident("x2", 1, 6), 
+                    }),
+                    generators: vec![ast::Comprehension {
+                        location: ast::Location::new(1, 9),
+                        target: mk_ident("y", 1, 13),
+                        iter: mk_ident("z", 1, 18),
+                        ifs: vec![],
+                        is_async: false,
+                    }],
+                }
+            }
+        );
+    }
+
     #[test]
     fn test_parse_list_comprehension() {
         let source = String::from("[x for y in z]");
diff --git a/tests/snippets/ints.py b/tests/snippets/ints.py
@@ -273,6 +273,13 @@ def __int__(self):
 
 assert int(F(1.2)) == 3
 
+class BadInt(int):
+    def __int__(self):
+        return 42.0
+
+with assertRaises(TypeError):
+    int(BadInt())
+
 assert isinstance((0).__round__(), int)
 assert isinstance((1).__round__(), int)
 assert (0).__round__() == 0
diff --git a/vm/src/pyobject.rs b/vm/src/pyobject.rs
@@ -392,6 +392,7 @@ impl PyContext {
         )
     }
 
+    #[inline(always)]
     pub fn new_bool(&self, b: bool) -> PyObjectRef {
         if b {
             self.true_value.clone().into_object()
diff --git a/vm/src/stdlib/socket.rs b/vm/src/stdlib/socket.rs
@@ -598,6 +598,7 @@ pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {
         "inet_ntoa" => ctx.new_rustfunc(socket_inet_ntoa),
         "gethostname" => ctx.new_rustfunc(socket_gethostname),
         "htonl" => ctx.new_rustfunc(socket_htonl),
+        "has_ipv6" => ctx.new_bool(false),
     });
 
     extend_module_platform_specific(vm, module)
diff --git a/vm/src/stdlib/thread.rs b/vm/src/stdlib/thread.rs
@@ -48,6 +48,10 @@ fn allocate_lock(vm: &VirtualMachine) -> PyResult {
     vm.invoke(&lock_class.into_object(), vec![])
 }
 
+fn unimplemented(_vm: &VirtualMachine) {
+    unimplemented!()
+}
+
 pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {
     let ctx = &vm.ctx;
 
@@ -63,5 +67,9 @@ pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {
         "get_ident" => ctx.new_rustfunc(get_ident),
         "allocate_lock" => ctx.new_rustfunc(allocate_lock),
         "TIMEOUT_MAX" => ctx.new_float(TIMEOUT_MAX),
+        "start_new_thread" => ctx.new_rustfunc(unimplemented),
+        "_set_sentinel" => ctx.new_rustfunc(unimplemented),
+        "error" => ctx.exceptions.base_exception_type.clone(),
+        "stack_size" => ctx.new_rustfunc(unimplemented),
     })
 }
diff --git a/vm/src/sysmodule.rs b/vm/src/sysmodule.rs
@@ -378,6 +378,8 @@ settrace() -- set the global debug tracing function
       "exec_prefix" => ctx.new_str(exec_prefix.to_string()),
       "base_exec_prefix" => ctx.new_str(base_exec_prefix.to_string()),
       "exit" => ctx.new_rustfunc(sys_exit),
+      "base_exec_prefix" => ctx.new_str("".to_string()),  // dummy
+      "exec_prefix" => ctx.new_str("".to_string()),  // dummy
     });
 
     modules.set_item("sys", module.clone(), vm).unwrap();

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`import logging, socket, os, pickle, struct, time, re`
`27`	`27`	`from stat import ST_DEV, ST_INO, ST_MTIME`
`28`	`28`	`import queue`
`29`		`-import threading`
	`29`	`+# import threading`
`30`	`30`
`31`	`31`	`#`
`32`	`32`	`# Some constants...`
Original file line number	Diff line number	Diff line change
`@@ -392,6 +392,7 @@ impl PyContext {`
`392`	`392`	`)`
`393`	`393`	`}`
`394`	`394`
	`395`	`+ #[inline(always)]`
`395`	`396`	`pub fn new_bool(&self, b: bool) -> PyObjectRef {`
`396`	`397`	`if b {`
`397`	`398`	`self.true_value.clone().into_object()`