[Python-checkins] cpython (3.1): Fix tkinter regression introduced by the security fix in #16248.

[antoine.pitrou]

http://hg.python.org/cpython/rev/c39f42f46a05
changeset:   85718:c39f42f46a05
branch:      3.1
parent:      80967:087ce7bbac9f
user:        Georg Brandl <georg at python.org>
date:        Sat Sep 14 09:08:09 2013 +0200
summary:
  Fix tkinter regression introduced by the security fix in #16248.

files:
  Lib/tkinter/__init__.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py
--- a/Lib/tkinter/__init__.py
+++ b/Lib/tkinter/__init__.py
@@ -1623,7 +1623,7 @@
         # ensure that self.tk is always _something_.
         self.tk = None
         if baseName is None:
-            import sys, os
+            import os
             baseName = os.path.basename(sys.argv[0])
             baseName, ext = os.path.splitext(baseName)
             if ext not in ('.py', '.pyc', '.pyo'):

-- 
Repository URL: http://hg.python.org/cpython