Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit a748032

Browse files
terryjreedyterryjreedy
committed
Refine geometry of idlelib htests (and a few other fix-ups).
1 parent cd5e388 commit a748032

19 files changed

Lines changed: 52 additions & 58 deletions

‎Lib/idlelib/calltip_w.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ def _calltip_window(parent): # htest #
138138

139139
top = Toplevel(parent)
140140
top.title("Test calltips")
141-
top.geometry("200x100+%d+%d" % (parent.winfo_rootx() + 200,
142-
parent.winfo_rooty() + 150))
141+
x, y = map(int, parent.geometry().split('+')[1:])
142+
top.geometry("200x100+%d+%d" % (x + 250, y + 175))
143143
text = Text(top)
144144
text.pack(side=LEFT, fill=BOTH, expand=1)
145145
text.insert("insert", "string.split")

‎Lib/idlelib/colorizer.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,8 +259,8 @@ def _color_delegator(parent): # htest #
259259

260260
top = Toplevel(parent)
261261
top.title("Test ColorDelegator")
262-
top.geometry("200x100+%d+%d" % (parent.winfo_rootx() + 200,
263-
parent.winfo_rooty() + 150))
262+
x, y = map(int, parent.geometry().split('+')[1:])
263+
top.geometry("200x100+%d+%d" % (x + 250, y + 175))
264264
source = "if somename: x = 'abc' # comment\nprint\n"
265265
text = Text(top, background="white")
266266
text.pack(expand=1, fill="both")
@@ -276,5 +276,6 @@ def _color_delegator(parent): # htest #
276276
import unittest
277277
unittest.main('idlelib.idle_test.test_colorizer',
278278
verbosity=2, exit=False)
279+
279280
from idlelib.idle_test.htest import run
280281
run(_color_delegator)

‎Lib/idlelib/debugobj.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
# XXX TO DO:
1010
# - for classes/modules, add "open source" to object browser
1111

12-
import re
13-
1412
from idlelib.tree import TreeItem, TreeNode, ScrolledCanvas
1513

1614
from reprlib import Repr
@@ -127,8 +125,8 @@ def _object_browser(parent): # htest #
127125
from tkinter import Toplevel
128126
top = Toplevel(parent)
129127
top.title("Test debug object browser")
130-
width, height, x, y = list(map(int, re.split('[x+]', parent.geometry())))
131-
top.geometry("+%d+%d"%(x + 100, y + 175))
128+
x, y = map(int, parent.geometry().split('+')[1:])
129+
top.geometry("+%d+%d" % (x + 100, y + 175))
132130
top.configure(bd=0, bg="yellow")
133131
top.focus_set()
134132
sc = ScrolledCanvas(top, bg="white", highlightthickness=0, takefocus=1)

‎Lib/idlelib/dynoption.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ def _dyn_option_menu(parent): # htest #
3838

3939
top = Toplevel(parent)
4040
top.title("Tets dynamic option menu")
41-
top.geometry("200x100+%d+%d" % (parent.winfo_rootx() + 200,
42-
parent.winfo_rooty() + 150))
41+
x, y = map(int, parent.geometry().split('+')[1:])
42+
top.geometry("200x100+%d+%d" % (x + 250, y + 175))
4343
top.focus_set()
4444

4545
var = StringVar(top)

‎Lib/idlelib/grep.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import os
22
import fnmatch
3-
import re # for htest
43
import sys
54
from tkinter import StringVar, BooleanVar, Checkbutton # for GrepDialog
65
from idlelib import searchengine
@@ -134,8 +133,8 @@ def _grep_dialog(parent): # htest #
134133
from tkinter import Toplevel, Text, Button, SEL, END
135134
top = Toplevel(parent)
136135
top.title("Test GrepDialog")
137-
width, height, x, y = list(map(int, re.split('[x+]', parent.geometry())))
138-
top.geometry("+%d+%d"%(x, y + 150))
136+
x, y = map(int, parent.geometry().split('+')[1:])
137+
top.geometry("+%d+%d" % (x, y + 175))
139138

140139
flist = PyShellFileList(top)
141140
text = Text(top, height=5)

‎Lib/idlelib/idle_test/test_configdialog.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def tearDownClass(cls):
2121
cls.root.destroy()
2222
del cls.root
2323

24-
def test_dialog(self):
24+
def test_configdialog(self):
2525
d = ConfigDialog(self.root, 'Test', _utest=True)
2626
d.remove_var_callbacks()
2727

‎Lib/idlelib/iomenu.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -535,8 +535,8 @@ def _io_binding(parent): # htest #
535535

536536
root = Toplevel(parent)
537537
root.title("Test IOBinding")
538-
width, height, x, y = list(map(int, re.split('[x+]', parent.geometry())))
539-
root.geometry("+%d+%d"%(x, y + 150))
538+
x, y = map(int, parent.geometry().split('+')[1:])
539+
root.geometry("+%d+%d" % (x, y + 175))
540540
class MyEditWin:
541541
def __init__(self, text):
542542
self.text = text

‎Lib/idlelib/multicall.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -417,8 +417,8 @@ def __del__(self):
417417
def _multi_call(parent): # htest #
418418
top = tkinter.Toplevel(parent)
419419
top.title("Test MultiCall")
420-
width, height, x, y = list(map(int, re.split('[x+]', parent.geometry())))
421-
top.geometry("+%d+%d"%(x, y + 150))
420+
x, y = map(int, parent.geometry().split('+')[1:])
421+
top.geometry("+%d+%d" % (x, y + 175))
422422
text = MultiCallCreator(tkinter.Text)(top)
423423
text.pack()
424424
def bindseq(seq, n=[0]):

‎Lib/idlelib/percolator.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ def removefilter(self, filter):
5757

5858
def _percolator(parent): # htest #
5959
import tkinter as tk
60-
import re
6160

6261
class Tracer(Delegator):
6362
def __init__(self, name):
@@ -74,8 +73,8 @@ def delete(self, *args):
7473

7574
box = tk.Toplevel(parent)
7675
box.title("Test Percolator")
77-
width, height, x, y = list(map(int, re.split('[x+]', parent.geometry())))
78-
box.geometry("+%d+%d" % (x, y + 150))
76+
x, y = map(int, parent.geometry().split('+')[1:])
77+
box.geometry("+%d+%d" % (x, y + 175))
7978
text = tk.Text(box)
8079
p = Percolator(text)
8180
pin = p.insertfilter

‎Lib/idlelib/redirector.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,12 +152,11 @@ def __call__(self, *args):
152152

153153
def _widget_redirector(parent): # htest #
154154
from tkinter import Toplevel, Text
155-
import re
156155

157156
top = Toplevel(parent)
158157
top.title("Test WidgetRedirector")
159-
width, height, x, y = list(map(int, re.split('[x+]', parent.geometry())))
160-
top.geometry("+%d+%d"%(x, y + 150))
158+
x, y = map(int, parent.geometry().split('+')[1:])
159+
top.geometry("+%d+%d" % (x, y + 175))
161160
text = Text(top)
162161
text.pack()
163162
text.focus_set()
@@ -171,5 +170,6 @@ def my_insert(*args):
171170
import unittest
172171
unittest.main('idlelib.idle_test.test_redirector',
173172
verbosity=2, exit=False)
173+
174174
from idlelib.idle_test.htest import run
175175
run(_widget_redirector)

0 commit comments

Comments
 (0)