]> granicus.if.org Git - python/commitdiff
Issue #16248: Disable code execution from the user's home directory by tkinter when...
authorAntoine Pitrou <solipsis@pitrou.net>
Sun, 9 Dec 2012 13:47:23 +0000 (14:47 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Sun, 9 Dec 2012 13:47:23 +0000 (14:47 +0100)
Patch by Zachary Ware.

1  2 
Lib/tkinter/__init__.py
Misc/NEWS

Simple merge
diff --cc Misc/NEWS
index c305f65293ea1c49899cf3140a691a2a8bc18daf,ff5647b816112d41668085283109753beb1cff69..73f4474a3bf81c4297f523e3dc75aea288568aed
+++ b/Misc/NEWS
@@@ -163,9 -108,9 +163,12 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #16248: Disable code execution from the user's home directory by
+   tkinter when the -E flag is passed to Python.  Patch by Zachary Ware.
 +- Issue #13390: New function :func:`sys.getallocatedblocks()` returns the
 +  number of memory blocks currently allocated.
 +
  - Issue #16628: Fix a memory leak in ctypes.resize().
  
  - Issue #13614: Fix setup.py register failure with invalid rst in description.