Skip to content

Commit 0d914ae

Browse files
committed
idlelib: replace idlelib.idle_test with test.test_idle
1 parent 2feaf52 commit 0d914ae

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+85
-85
lines changed

Lib/idlelib/autocomplete.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -225,4 +225,4 @@ def get_entity(self, name):
225225

226226
if __name__ == '__main__':
227227
from unittest import main
228-
main('idlelib.idle_test.test_autocomplete', verbosity=2)
228+
main('test.test_idle.test_autocomplete', verbosity=2)

Lib/idlelib/autocomplete_w.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -497,6 +497,6 @@ def hide_window(self):
497497

498498
if __name__ == '__main__':
499499
from unittest import main
500-
main('idlelib.idle_test.test_autocomplete_w', verbosity=2, exit=False)
500+
main('test.test_idle.test_autocomplete_w', verbosity=2, exit=False)
501501

502502
# TODO: autocomplete/w htest here

Lib/idlelib/autoexpand.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,4 @@ def getprevword(self):
9393

9494
if __name__ == '__main__':
9595
from unittest import main
96-
main('idlelib.idle_test.test_autoexpand', verbosity=2)
96+
main('test.test_idle.test_autoexpand', verbosity=2)

Lib/idlelib/browser.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,6 @@ class Nested_in_closure: pass
244244
if __name__ == "__main__":
245245
if len(sys.argv) == 1: # If pass file on command line, unittest fails.
246246
from unittest import main
247-
main('idlelib.idle_test.test_browser', verbosity=2, exit=False)
248-
from idlelib.idle_test.htest import run
247+
main('test.test_idle.test_browser', verbosity=2, exit=False)
248+
from test.test_idle.htest import run
249249
run(_module_browser)

Lib/idlelib/calltip.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -202,4 +202,4 @@ def get_argspec(ob):
202202

203203
if __name__ == '__main__':
204204
from unittest import main
205-
main('idlelib.idle_test.test_calltip', verbosity=2)
205+
main('test.test_idle.test_calltip', verbosity=2)

Lib/idlelib/calltip_w.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ def calltip_hide(event):
195195

196196
if __name__ == '__main__':
197197
from unittest import main
198-
main('idlelib.idle_test.test_calltip_w', verbosity=2, exit=False)
198+
main('test.test_idle.test_calltip_w', verbosity=2, exit=False)
199199

200-
from idlelib.idle_test.htest import run
200+
from test.test_idle.htest import run
201201
run(_calltip_window)

Lib/idlelib/codecontext.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,6 @@ def update_highlight_colors(self):
265265

266266
if __name__ == "__main__":
267267
from unittest import main
268-
main('idlelib.idle_test.test_codecontext', verbosity=2, exit=False)
268+
main('test.test_idle.test_codecontext', verbosity=2, exit=False)
269269

270270
# Add htest.

Lib/idlelib/colorizer.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ def removecolors(self):
357357

358358
def _color_delegator(parent): # htest #
359359
from tkinter import Toplevel, Text
360-
from idlelib.idle_test.test_colorizer import source
360+
from test.test_idle.test_colorizer import source
361361
from idlelib.percolator import Percolator
362362

363363
top = Toplevel(parent)
@@ -378,7 +378,7 @@ def _color_delegator(parent): # htest #
378378

379379
if __name__ == "__main__":
380380
from unittest import main
381-
main('idlelib.idle_test.test_colorizer', verbosity=2, exit=False)
381+
main('test.test_idle.test_colorizer', verbosity=2, exit=False)
382382

383-
from idlelib.idle_test.htest import run
383+
from test.test_idle.htest import run
384384
run(_color_delegator)

Lib/idlelib/config.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -906,6 +906,6 @@ def dumpCfg(cfg):
906906

907907
if __name__ == '__main__':
908908
from unittest import main
909-
main('idlelib.idle_test.test_config', verbosity=2, exit=False)
909+
main('test.test_idle.test_config', verbosity=2, exit=False)
910910

911911
# Run revised _dump() as htest?

Lib/idlelib/config_key.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ def bind_ok(self, keys):
321321

322322
if __name__ == '__main__':
323323
from unittest import main
324-
main('idlelib.idle_test.test_config_key', verbosity=2, exit=False)
324+
main('test.test_idle.test_config_key', verbosity=2, exit=False)
325325

326-
from idlelib.idle_test.htest import run
326+
from test.test_idle.htest import run
327327
run(GetKeysDialog)

Lib/idlelib/configdialog.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2408,7 +2408,7 @@ def _configure_canvas(event):
24082408

24092409
if __name__ == '__main__':
24102410
from unittest import main
2411-
main('idlelib.idle_test.test_configdialog', verbosity=2, exit=False)
2411+
main('test.test_idle.test_configdialog', verbosity=2, exit=False)
24122412

2413-
from idlelib.idle_test.htest import run
2413+
from test.test_idle.htest import run
24142414
run(ConfigDialog)

Lib/idlelib/debugger.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,6 @@ def close(self):
545545

546546
if __name__ == "__main__":
547547
from unittest import main
548-
main('idlelib.idle_test.test_debugger', verbosity=2, exit=False)
548+
main('test.test_idle.test_debugger', verbosity=2, exit=False)
549549

550550
# TODO: htest?

Lib/idlelib/debugger_r.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -390,4 +390,4 @@ def restart_subprocess_debugger(rpcclt):
390390

391391
if __name__ == "__main__":
392392
from unittest import main
393-
main('idlelib.idle_test.test_debugger_r', verbosity=2, exit=False)
393+
main('test.test_idle.test_debugger_r', verbosity=2, exit=False)

Lib/idlelib/debugobj.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ def _object_browser(parent): # htest #
136136

137137
if __name__ == '__main__':
138138
from unittest import main
139-
main('idlelib.idle_test.test_debugobj', verbosity=2, exit=False)
139+
main('test.test_idle.test_debugobj', verbosity=2, exit=False)
140140

141-
from idlelib.idle_test.htest import run
141+
from test.test_idle.htest import run
142142
run(_object_browser)

Lib/idlelib/debugobj_r.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ def _GetSubList(self):
3838

3939
if __name__ == '__main__':
4040
from unittest import main
41-
main('idlelib.idle_test.test_debugobj_r', verbosity=2)
41+
main('test.test_idle.test_debugobj_r', verbosity=2)

Lib/idlelib/delegator.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ def setdelegate(self, delegate):
3030

3131
if __name__ == '__main__':
3232
from unittest import main
33-
main('idlelib.idle_test.test_delegator', verbosity=2)
33+
main('test.test_idle.test_delegator', verbosity=2)

Lib/idlelib/dynoption.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,5 @@ def update():
5454
button.pack()
5555

5656
if __name__ == '__main__':
57-
from idlelib.idle_test.htest import run
57+
from test.test_idle.htest import run
5858
run(_dyn_option_menu)

Lib/idlelib/editor.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1667,7 +1667,7 @@ def _editor_window(parent): # htest #
16671667

16681668
if __name__ == '__main__':
16691669
from unittest import main
1670-
main('idlelib.idle_test.test_editor', verbosity=2, exit=False)
1670+
main('test.test_idle.test_editor', verbosity=2, exit=False)
16711671

1672-
from idlelib.idle_test.htest import run
1672+
from test.test_idle.htest import run
16731673
run(_editor_window)

Lib/idlelib/filelist.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,6 @@ def _test(): # TODO check and convert to htest
126126

127127
if __name__ == '__main__':
128128
from unittest import main
129-
main('idlelib.idle_test.test_filelist', verbosity=2)
129+
main('test.test_idle.test_filelist', verbosity=2)
130130

131131
# _test()

Lib/idlelib/format.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -423,4 +423,4 @@ def do_rstrip(self, event=None):
423423

424424
if __name__ == "__main__":
425425
from unittest import main
426-
main('idlelib.idle_test.test_format', verbosity=2, exit=False)
426+
main('test.test_idle.test_format', verbosity=2, exit=False)

Lib/idlelib/grep.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ def show_grep_dialog():
215215

216216
if __name__ == "__main__":
217217
from unittest import main
218-
main('idlelib.idle_test.test_grep', verbosity=2, exit=False)
218+
main('test.test_idle.test_grep', verbosity=2, exit=False)
219219

220-
from idlelib.idle_test.htest import run
220+
from test.test_idle.htest import run
221221
run(_grep_dialog)

Lib/idlelib/help.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ def show_idlehelp(parent):
288288

289289
if __name__ == '__main__':
290290
from unittest import main
291-
main('idlelib.idle_test.test_help', verbosity=2, exit=False)
291+
main('test.test_idle.test_help', verbosity=2, exit=False)
292292

293-
from idlelib.idle_test.htest import run
293+
from test.test_idle.htest import run
294294
run(show_idlehelp)

Lib/idlelib/help_about.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ def ok(self, event=None):
205205

206206
if __name__ == '__main__':
207207
from unittest import main
208-
main('idlelib.idle_test.test_help_about', verbosity=2, exit=False)
208+
main('test.test_idle.test_help_about', verbosity=2, exit=False)
209209

210-
from idlelib.idle_test.htest import run
210+
from test.test_idle.htest import run
211211
run(AboutDialog)

Lib/idlelib/history.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,4 +103,4 @@ def store(self, source):
103103

104104
if __name__ == "__main__":
105105
from unittest import main
106-
main('idlelib.idle_test.test_history', verbosity=2, exit=False)
106+
main('test.test_idle.test_history', verbosity=2, exit=False)

Lib/idlelib/hyperparser.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -309,4 +309,4 @@ def get_expression(self):
309309

310310
if __name__ == '__main__':
311311
from unittest import main
312-
main('idlelib.idle_test.test_hyperparser', verbosity=2)
312+
main('test.test_idle.test_hyperparser', verbosity=2)

Lib/idlelib/iomenu.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ def savecopy(self, event):
429429

430430
if __name__ == "__main__":
431431
from unittest import main
432-
main('idlelib.idle_test.test_iomenu', verbosity=2, exit=False)
432+
main('test.test_idle.test_iomenu', verbosity=2, exit=False)
433433

434-
from idlelib.idle_test.htest import run
434+
from test.test_idle.htest import run
435435
run(_io_binding)

Lib/idlelib/macosx.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -263,4 +263,4 @@ def setupApp(root, flist):
263263

264264
if __name__ == '__main__':
265265
from unittest import main
266-
main('idlelib.idle_test.test_macosx', verbosity=2)
266+
main('test.test_idle.test_macosx', verbosity=2)

Lib/idlelib/mainmenu.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,4 +122,4 @@
122122

123123
if __name__ == '__main__':
124124
from unittest import main
125-
main('idlelib.idle_test.test_mainmenu', verbosity=2)
125+
main('test.test_idle.test_mainmenu', verbosity=2)

Lib/idlelib/multicall.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ def handler(event):
442442

443443
if __name__ == "__main__":
444444
from unittest import main
445-
main('idlelib.idle_test.test_mainmenu', verbosity=2, exit=False)
445+
main('test.test_idle.test_mainmenu', verbosity=2, exit=False)
446446

447-
from idlelib.idle_test.htest import run
447+
from test.test_idle.htest import run
448448
run(_multi_call)

Lib/idlelib/outwin.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,4 +184,4 @@ def setup(self):
184184

185185
if __name__ == '__main__':
186186
from unittest import main
187-
main('idlelib.idle_test.test_outwin', verbosity=2, exit=False)
187+
main('test.test_idle.test_outwin', verbosity=2, exit=False)

Lib/idlelib/parenmatch.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,4 +180,4 @@ def set_timeout_last(self):
180180

181181
if __name__ == '__main__':
182182
from unittest import main
183-
main('idlelib.idle_test.test_parenmatch', verbosity=2)
183+
main('test.test_idle.test_parenmatch', verbosity=2)

Lib/idlelib/pathbrowser.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ def _path_browser(parent): # htest #
105105

106106
if __name__ == "__main__":
107107
from unittest import main
108-
main('idlelib.idle_test.test_pathbrowser', verbosity=2, exit=False)
108+
main('test.test_idle.test_pathbrowser', verbosity=2, exit=False)
109109

110-
from idlelib.idle_test.htest import run
110+
from test.test_idle.htest import run
111111
run(_path_browser)

Lib/idlelib/percolator.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def toggle2():
112112

113113
if __name__ == "__main__":
114114
from unittest import main
115-
main('idlelib.idle_test.test_percolator', verbosity=2, exit=False)
115+
main('test.test_idle.test_percolator', verbosity=2, exit=False)
116116

117-
from idlelib.idle_test.htest import run
117+
from test.test_idle.htest import run
118118
run(_percolator)

Lib/idlelib/pyparse.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -586,4 +586,4 @@ def get_last_stmt_bracketing(self):
586586

587587
if __name__ == '__main__':
588588
from unittest import main
589-
main('idlelib.idle_test.test_pyparse', verbosity=2)
589+
main('test.test_idle.test_pyparse', verbosity=2)

Lib/idlelib/query.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ def entry_ok(self):
386386

387387
if __name__ == '__main__':
388388
from unittest import main
389-
main('idlelib.idle_test.test_query', verbosity=2, exit=False)
389+
main('test.test_idle.test_query', verbosity=2, exit=False)
390390

391-
from idlelib.idle_test.htest import run
391+
from test.test_idle.htest import run
392392
run(Query, HelpSource, CustomRun)

Lib/idlelib/redirector.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ def my_insert(*args):
168168

169169
if __name__ == "__main__":
170170
from unittest import main
171-
main('idlelib.idle_test.test_redirector', verbosity=2, exit=False)
171+
main('test.test_idle.test_redirector', verbosity=2, exit=False)
172172

173-
from idlelib.idle_test.htest import run
173+
from test.test_idle.htest import run
174174
run(_widget_redirector)

Lib/idlelib/replace.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ def show_replace():
301301

302302
if __name__ == '__main__':
303303
from unittest import main
304-
main('idlelib.idle_test.test_replace', verbosity=2, exit=False)
304+
main('test.test_idle.test_replace', verbosity=2, exit=False)
305305

306-
from idlelib.idle_test.htest import run
306+
from test.test_idle.htest import run
307307
run(_replace_dialog)

Lib/idlelib/rpc.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -632,4 +632,4 @@ def displayhook(value):
632632

633633
if __name__ == '__main__':
634634
from unittest import main
635-
main('idlelib.idle_test.test_rpc', verbosity=2,)
635+
main('test.test_idle.test_rpc', verbosity=2,)

Lib/idlelib/run.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -637,6 +637,6 @@ def stackviewer(self, flist_oid=None):
637637

638638
if __name__ == '__main__':
639639
from unittest import main
640-
main('idlelib.idle_test.test_run', verbosity=2)
640+
main('test.test_idle.test_run', verbosity=2)
641641

642642
capture_warnings(False) # Make sure turned off; see bpo-18081.

Lib/idlelib/runscript.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,4 +210,4 @@ def errorbox(self, title, message):
210210

211211
if __name__ == "__main__":
212212
from unittest import main
213-
main('idlelib.idle_test.test_runscript', verbosity=2,)
213+
main('test.test_idle.test_runscript', verbosity=2,)

Lib/idlelib/scrolledlist.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def on_double(self, index): print("double", self.get(index))
143143

144144
if __name__ == '__main__':
145145
from unittest import main
146-
main('idlelib.idle_test.test_scrolledlist', verbosity=2,)
146+
main('test.test_idle.test_scrolledlist', verbosity=2,)
147147

148-
from idlelib.idle_test.htest import run
148+
from test.test_idle.htest import run
149149
run(_scrolled_list)

Lib/idlelib/search.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ def show_find():
158158

159159
if __name__ == '__main__':
160160
from unittest import main
161-
main('idlelib.idle_test.test_search', verbosity=2, exit=False)
161+
main('test.test_idle.test_search', verbosity=2, exit=False)
162162

163-
from idlelib.idle_test.htest import run
163+
from test.test_idle.htest import run
164164
run(_search_dialog)

Lib/idlelib/searchbase.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ def default_command(self, dummy): pass
204204

205205
if __name__ == '__main__':
206206
from unittest import main
207-
main('idlelib.idle_test.test_searchbase', verbosity=2, exit=False)
207+
main('test.test_idle.test_searchbase', verbosity=2, exit=False)
208208

209-
from idlelib.idle_test.htest import run
209+
from test.test_idle.htest import run
210210
run(_searchbase)

Lib/idlelib/searchengine.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -231,4 +231,4 @@ def get_line_col(index):
231231

232232
if __name__ == "__main__":
233233
from unittest import main
234-
main('idlelib.idle_test.test_searchengine', verbosity=2)
234+
main('test.test_idle.test_searchengine', verbosity=2)

Lib/idlelib/sidebar.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ def update_colors(self):
515515

516516

517517
def _linenumbers_drag_scrolling(parent): # htest #
518-
from idlelib.idle_test.test_sidebar import Dummy_editwin
518+
from test.test_idle.test_sidebar import Dummy_editwin
519519

520520
toplevel = tk.Toplevel(parent)
521521
text_frame = tk.Frame(toplevel)
@@ -538,7 +538,7 @@ def _linenumbers_drag_scrolling(parent): # htest #
538538

539539
if __name__ == '__main__':
540540
from unittest import main
541-
main('idlelib.idle_test.test_sidebar', verbosity=2, exit=False)
541+
main('test.test_idle.test_sidebar', verbosity=2, exit=False)
542542

543-
from idlelib.idle_test.htest import run
543+
from test.test_idle.htest import run
544544
run(_linenumbers_drag_scrolling)

Lib/idlelib/squeezer.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,6 @@ def squeeze_current_text(self):
340340

341341
if __name__ == "__main__":
342342
from unittest import main
343-
main('idlelib.idle_test.test_squeezer', verbosity=2, exit=False)
343+
main('test.test_idle.test_squeezer', verbosity=2, exit=False)
344344

345345
# Add htest.

0 commit comments

Comments
 (0)