languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-09-16 03:20:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge with 3.5

Browse source
This commit is contained in:
Terry Jan Reedy 2016-08-16 01:44:31 -04:00
parent 4770d6ec76 22ba01ea55
commit f050a33ce2
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
import _tkinter # If this fails your Python may not be configured for Tk
@ -68,7 +70,6 @@
# 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:
@ -472,7 +473,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")