Commit f25d9573 authored by Barry Warsaw's avatar Barry Warsaw

- 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.
parent 55f23c42
...@@ -1643,7 +1643,9 @@ class Tk(Misc, Wm): ...@@ -1643,7 +1643,9 @@ class Tk(Misc, Wm):
self.tk = _tkinter.create(screenName, baseName, className, interactive, wantobjects, useTk, sync, use) self.tk = _tkinter.create(screenName, baseName, className, interactive, wantobjects, useTk, sync, use)
if useTk: if useTk:
self._loadtk() self._loadtk()
self.readprofile(baseName, className) if not sys.flags.ignore_environment:
# Issue #16248: Honor the -E flag to avoid code injection.
self.readprofile(baseName, className)
def loadtk(self): def loadtk(self):
if not self._tkloaded: if not self._tkloaded:
self.tk.loadtk() self.tk.loadtk()
......
...@@ -13,6 +13,9 @@ Core and Builtins ...@@ -13,6 +13,9 @@ Core and Builtins
Library 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.
What's New in Python 2.6.8? What's New in Python 2.6.8?
=========================== ===========================
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment