Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #27611: Don't import volatile attribute.

This commit is contained in:
Terry Jan Reedy 2016-08-16 01:44:12 -04:00
parent 76aa1fb3b1
commit 22ba01ea55
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/tkinter/tix.py
View File

@ -26,8 +26,10 @@
# appreciate the advantages.
#
import os
import tkinter
from tkinter import *
from tkinter import _cnfmerge, _default_root
from tkinter import _cnfmerge
# WARNING - TkVersion is a limited precision floating point number
if TkVersion < 3.999:
@ -72,7 +74,6 @@ TCL_ALL_EVENTS = 0
# BEWARE - this is implemented by copying some code from the Widget class
# in Tkinter (to override Widget initialization) and is therefore
# liable to break.
import tkinter, os
# Could probably add this to Tkinter.Misc
class tixCommand:
@ -476,7 +477,7 @@ class DisplayStyle:
(multiple) Display Items"""
def __init__(self, itemtype, cnf={}, **kw):
master = _default_root # global from Tkinter
master = tkinter._default_root # global from Tkinter
if not master and 'refwindow' in cnf: master=cnf['refwindow']
elif not master and 'refwindow' in kw: master= kw['refwindow']
elif not master: raise RuntimeError("Too early to create display style: no root window")