Merge pull request #1508 from HyeockJinKim/issue1356

windelbouwman · web-flow · commit ef2526416b9e · 2019-10-11T08:32:57.000+02:00
locals() return copy of locals dictionary
diff --git a/tests/snippets/global_nonlocal.py b/tests/snippets/global_nonlocal.py
@@ -85,3 +85,27 @@ def f():
 #     nonlocal c
 #     c = 2
 
+def a():
+    x = 0
+    locals()['x'] = 3
+    assert x == 0
+
+a()
+
+def a():
+    x = 0
+    del locals()['x']
+    assert x == 0
+
+a()
+
+def a():
+    x = 0
+    b = locals()
+    assert b['x'] == 0
+
+    del b['x']
+    b = locals()
+    assert b['x'] == 0
+
+a()
diff --git a/vm/src/builtins.rs b/vm/src/builtins.rs
@@ -366,7 +366,8 @@ fn builtin_len(obj: PyObjectRef, vm: &VirtualMachine) -> PyResult {
 }
 
 fn builtin_locals(vm: &VirtualMachine) -> PyDictRef {
-    vm.get_locals()
+    let locals = vm.get_locals();
+    locals.copy(vm).into_ref(vm)
 }
 
 fn builtin_max(vm: &VirtualMachine, args: PyFuncArgs) -> PyResult {
diff --git a/vm/src/obj/objdict.rs b/vm/src/obj/objdict.rs
@@ -279,7 +279,7 @@ impl PyDictRef {
         }
     }
 
-    fn copy(self, _vm: &VirtualMachine) -> PyDict {
+    pub fn copy(self, _vm: &VirtualMachine) -> PyDict {
         PyDict {
             entries: self.entries.clone(),
         }

Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,8 @@ fn builtin_len(obj: PyObjectRef, vm: &VirtualMachine) -> PyResult {`
`366`	`366`	`}`
`367`	`367`
`368`	`368`	`fn builtin_locals(vm: &VirtualMachine) -> PyDictRef {`
`369`		`- vm.get_locals()`
	`369`	`+ let locals = vm.get_locals();`
	`370`	`+ locals.copy(vm).into_ref(vm)`
`370`	`371`	`}`
`371`	`372`
`372`	`373`	`fn builtin_max(vm: &VirtualMachine, args: PyFuncArgs) -> PyResult {`
Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ impl PyDictRef {`
`279`	`279`	`}`
`280`	`280`	`}`
`281`	`281`
`282`		`- fn copy(self, _vm: &VirtualMachine) -> PyDict {`
	`282`	`+ pub fn copy(self, _vm: &VirtualMachine) -> PyDict {`
`283`	`283`	`PyDict {`
`284`	`284`	`entries: self.entries.clone(),`
`285`	`285`	`}`