@@ -40,11 +40,11 @@ def test_pack_configure_after(self):
4040 b .pack_configure (side = 'top' )
4141 c .pack_configure (side = 'top' )
4242 d .pack_configure (side = 'top' )
43- self .assertEqual (pack .pack_slaves (), [a , b , c , d ])
43+ self .assertEqual (pack .pack_content (), [a , b , c , d ])
4444 a .pack_configure (after = b )
45- self .assertEqual (pack .pack_slaves (), [b , a , c , d ])
45+ self .assertEqual (pack .pack_content (), [b , a , c , d ])
4646 a .pack_configure (after = a )
47- self .assertEqual (pack .pack_slaves (), [b , a , c , d ])
47+ self .assertEqual (pack .pack_content (), [b , a , c , d ])
4848
4949 def test_pack_configure_anchor (self ):
5050 pack , a , b , c , d = self .create2 ()
@@ -73,11 +73,11 @@ def test_pack_configure_before(self):
7373 b .pack_configure (side = 'top' )
7474 c .pack_configure (side = 'top' )
7575 d .pack_configure (side = 'top' )
76- self .assertEqual (pack .pack_slaves (), [a , b , c , d ])
76+ self .assertEqual (pack .pack_content (), [a , b , c , d ])
7777 a .pack_configure (before = d )
78- self .assertEqual (pack .pack_slaves (), [b , c , a , d ])
78+ self .assertEqual (pack .pack_content (), [b , c , a , d ])
7979 a .pack_configure (before = a )
80- self .assertEqual (pack .pack_slaves (), [b , c , a , d ])
80+ self .assertEqual (pack .pack_content (), [b , c , a , d ])
8181
8282 def test_pack_configure_expand (self ):
8383 pack , a , b , c , d = self .create2 ()
@@ -110,10 +110,10 @@ def test_pack_configure_in(self):
110110 c .pack_configure (side = 'top' )
111111 d .pack_configure (side = 'top' )
112112 a .pack_configure (in_ = pack )
113- self .assertEqual (pack .pack_slaves (), [b , c , d , a ])
113+ self .assertEqual (pack .pack_content (), [b , c , d , a ])
114114 a .pack_configure (in_ = c )
115- self .assertEqual (pack .pack_slaves (), [b , c , d ])
116- self .assertEqual (c .pack_slaves (), [a ])
115+ self .assertEqual (pack .pack_content (), [b , c , d ])
116+ self .assertEqual (c .pack_content (), [a ])
117117 with self .assertRaisesRegex (
118118 TclError , """can't pack "?%s"? inside itself""" % (a ,)):
119119 a .pack_configure (in_ = a )
@@ -223,11 +223,11 @@ def test_pack_forget(self):
223223 a .pack_configure ()
224224 b .pack_configure ()
225225 c .pack_configure ()
226- self .assertEqual (pack .pack_slaves (), [a , b , c ])
226+ self .assertEqual (pack .pack_content (), [a , b , c ])
227227 b .pack_forget ()
228- self .assertEqual (pack .pack_slaves (), [a , c ])
228+ self .assertEqual (pack .pack_content (), [a , c ])
229229 b .pack_forget ()
230- self .assertEqual (pack .pack_slaves (), [a , c ])
230+ self .assertEqual (pack .pack_content (), [a , c ])
231231 d .pack_forget ()
232232
233233 def test_pack_info (self ):
@@ -273,6 +273,14 @@ def test_pack_propagate(self):
273273 self .assertEqual (pack .winfo_reqwidth (), 20 )
274274 self .assertEqual (pack .winfo_reqheight (), 40 )
275275
276+ def test_pack_content (self ):
277+ pack , a , b , c , d = self .create2 ()
278+ self .assertEqual (pack .pack_content (), [])
279+ a .pack_configure ()
280+ self .assertEqual (pack .pack_content (), [a ])
281+ b .pack_configure ()
282+ self .assertEqual (pack .pack_content (), [a , b ])
283+
276284 def test_pack_slaves (self ):
277285 pack , a , b , c , d = self .create2 ()
278286 self .assertEqual (pack .pack_slaves (), [])
@@ -477,6 +485,15 @@ def test_place_info(self):
477485 with self .assertRaises (TypeError ):
478486 f2 .place_info (0 )
479487
488+ def test_place_content (self ):
489+ foo = tkinter .Frame (self .root )
490+ bar = tkinter .Frame (self .root )
491+ self .assertEqual (foo .place_content (), [])
492+ bar .place_configure (in_ = foo )
493+ self .assertEqual (foo .place_content (), [bar ])
494+ with self .assertRaises (TypeError ):
495+ foo .place_content (0 )
496+
480497 def test_place_slaves (self ):
481498 foo = tkinter .Frame (self .root )
482499 bar = tkinter .Frame (self .root )
@@ -729,10 +746,10 @@ def test_grid_forget(self):
729746 c = tkinter .Button (self .root )
730747 b .grid_configure (row = 2 , column = 2 , rowspan = 2 , columnspan = 2 ,
731748 padx = 3 , pady = 4 , sticky = 'ns' )
732- self .assertEqual (self .root .grid_slaves (), [b ])
749+ self .assertEqual (self .root .grid_content (), [b ])
733750 b .grid_forget ()
734751 c .grid_forget ()
735- self .assertEqual (self .root .grid_slaves (), [])
752+ self .assertEqual (self .root .grid_content (), [])
736753 self .assertEqual (b .grid_info (), {})
737754 b .grid_configure (row = 0 , column = 0 )
738755 info = b .grid_info ()
@@ -749,10 +766,10 @@ def test_grid_remove(self):
749766 c = tkinter .Button (self .root )
750767 b .grid_configure (row = 2 , column = 2 , rowspan = 2 , columnspan = 2 ,
751768 padx = 3 , pady = 4 , sticky = 'ns' )
752- self .assertEqual (self .root .grid_slaves (), [b ])
769+ self .assertEqual (self .root .grid_content (), [b ])
753770 b .grid_remove ()
754771 c .grid_remove ()
755- self .assertEqual (self .root .grid_slaves (), [])
772+ self .assertEqual (self .root .grid_content (), [])
756773 self .assertEqual (b .grid_info (), {})
757774 b .grid_configure (row = 0 , column = 0 )
758775 info = b .grid_info ()
@@ -887,6 +904,23 @@ def test_grid_size(self):
887904 f .grid_configure (row = 4 , column = 5 )
888905 self .assertEqual (self .root .grid_size (), (6 , 5 ))
889906
907+ def test_grid_content (self ):
908+ self .assertEqual (self .root .grid_content (), [])
909+ a = tkinter .Label (self .root )
910+ a .grid_configure (row = 0 , column = 1 )
911+ b = tkinter .Label (self .root )
912+ b .grid_configure (row = 1 , column = 0 )
913+ c = tkinter .Label (self .root )
914+ c .grid_configure (row = 1 , column = 1 )
915+ d = tkinter .Label (self .root )
916+ d .grid_configure (row = 1 , column = 1 )
917+ self .assertEqual (self .root .grid_content (), [d , c , b , a ])
918+ self .assertEqual (self .root .grid_content (row = 0 ), [a ])
919+ self .assertEqual (self .root .grid_content (row = 1 ), [d , c , b ])
920+ self .assertEqual (self .root .grid_content (column = 0 ), [b ])
921+ self .assertEqual (self .root .grid_content (column = 1 ), [d , c , a ])
922+ self .assertEqual (self .root .grid_content (row = 1 , column = 1 ), [d , c ])
923+
890924 def test_grid_slaves (self ):
891925 self .assertEqual (self .root .grid_slaves (), [])
892926 a = tkinter .Label (self .root )
0 commit comments