@@ -39,11 +39,11 @@ def test_pack_configure_after(self):
3939 b .pack_configure (side = 'top' )
4040 c .pack_configure (side = 'top' )
4141 d .pack_configure (side = 'top' )
42- self .assertEqual (pack .pack_slaves (), [a , b , c , d ])
42+ self .assertEqual (pack .pack_content (), [a , b , c , d ])
4343 a .pack_configure (after = b )
44- self .assertEqual (pack .pack_slaves (), [b , a , c , d ])
44+ self .assertEqual (pack .pack_content (), [b , a , c , d ])
4545 a .pack_configure (after = a )
46- self .assertEqual (pack .pack_slaves (), [b , a , c , d ])
46+ self .assertEqual (pack .pack_content (), [b , a , c , d ])
4747
4848 def test_pack_configure_anchor (self ):
4949 pack , a , b , c , d = self .create2 ()
@@ -72,11 +72,11 @@ def test_pack_configure_before(self):
7272 b .pack_configure (side = 'top' )
7373 c .pack_configure (side = 'top' )
7474 d .pack_configure (side = 'top' )
75- self .assertEqual (pack .pack_slaves (), [a , b , c , d ])
75+ self .assertEqual (pack .pack_content (), [a , b , c , d ])
7676 a .pack_configure (before = d )
77- self .assertEqual (pack .pack_slaves (), [b , c , a , d ])
77+ self .assertEqual (pack .pack_content (), [b , c , a , d ])
7878 a .pack_configure (before = a )
79- self .assertEqual (pack .pack_slaves (), [b , c , a , d ])
79+ self .assertEqual (pack .pack_content (), [b , c , a , d ])
8080
8181 def test_pack_configure_expand (self ):
8282 pack , a , b , c , d = self .create2 ()
@@ -109,10 +109,10 @@ def test_pack_configure_in(self):
109109 c .pack_configure (side = 'top' )
110110 d .pack_configure (side = 'top' )
111111 a .pack_configure (in_ = pack )
112- self .assertEqual (pack .pack_slaves (), [b , c , d , a ])
112+ self .assertEqual (pack .pack_content (), [b , c , d , a ])
113113 a .pack_configure (in_ = c )
114- self .assertEqual (pack .pack_slaves (), [b , c , d ])
115- self .assertEqual (c .pack_slaves (), [a ])
114+ self .assertEqual (pack .pack_content (), [b , c , d ])
115+ self .assertEqual (c .pack_content (), [a ])
116116 with self .assertRaisesRegex (
117117 TclError , """can't pack "?%s"? inside itself""" % (a ,)):
118118 a .pack_configure (in_ = a )
@@ -222,11 +222,11 @@ def test_pack_forget(self):
222222 a .pack_configure ()
223223 b .pack_configure ()
224224 c .pack_configure ()
225- self .assertEqual (pack .pack_slaves (), [a , b , c ])
225+ self .assertEqual (pack .pack_content (), [a , b , c ])
226226 b .pack_forget ()
227- self .assertEqual (pack .pack_slaves (), [a , c ])
227+ self .assertEqual (pack .pack_content (), [a , c ])
228228 b .pack_forget ()
229- self .assertEqual (pack .pack_slaves (), [a , c ])
229+ self .assertEqual (pack .pack_content (), [a , c ])
230230 d .pack_forget ()
231231
232232 def test_pack_info (self ):
@@ -272,6 +272,14 @@ def test_pack_propagate(self):
272272 self .assertEqual (pack .winfo_reqwidth (), 20 )
273273 self .assertEqual (pack .winfo_reqheight (), 40 )
274274
275+ def test_pack_content (self ):
276+ pack , a , b , c , d = self .create2 ()
277+ self .assertEqual (pack .pack_content (), [])
278+ a .pack_configure ()
279+ self .assertEqual (pack .pack_content (), [a ])
280+ b .pack_configure ()
281+ self .assertEqual (pack .pack_content (), [a , b ])
282+
275283 def test_pack_slaves (self ):
276284 pack , a , b , c , d = self .create2 ()
277285 self .assertEqual (pack .pack_slaves (), [])
@@ -476,6 +484,15 @@ def test_place_info(self):
476484 with self .assertRaises (TypeError ):
477485 f2 .place_info (0 )
478486
487+ def test_place_content (self ):
488+ foo = tkinter .Frame (self .root )
489+ bar = tkinter .Frame (self .root )
490+ self .assertEqual (foo .place_content (), [])
491+ bar .place_configure (in_ = foo )
492+ self .assertEqual (foo .place_content (), [bar ])
493+ with self .assertRaises (TypeError ):
494+ foo .place_content (0 )
495+
479496 def test_place_slaves (self ):
480497 foo = tkinter .Frame (self .root )
481498 bar = tkinter .Frame (self .root )
@@ -728,10 +745,10 @@ def test_grid_forget(self):
728745 c = tkinter .Button (self .root )
729746 b .grid_configure (row = 2 , column = 2 , rowspan = 2 , columnspan = 2 ,
730747 padx = 3 , pady = 4 , sticky = 'ns' )
731- self .assertEqual (self .root .grid_slaves (), [b ])
748+ self .assertEqual (self .root .grid_content (), [b ])
732749 b .grid_forget ()
733750 c .grid_forget ()
734- self .assertEqual (self .root .grid_slaves (), [])
751+ self .assertEqual (self .root .grid_content (), [])
735752 self .assertEqual (b .grid_info (), {})
736753 b .grid_configure (row = 0 , column = 0 )
737754 info = b .grid_info ()
@@ -748,10 +765,10 @@ def test_grid_remove(self):
748765 c = tkinter .Button (self .root )
749766 b .grid_configure (row = 2 , column = 2 , rowspan = 2 , columnspan = 2 ,
750767 padx = 3 , pady = 4 , sticky = 'ns' )
751- self .assertEqual (self .root .grid_slaves (), [b ])
768+ self .assertEqual (self .root .grid_content (), [b ])
752769 b .grid_remove ()
753770 c .grid_remove ()
754- self .assertEqual (self .root .grid_slaves (), [])
771+ self .assertEqual (self .root .grid_content (), [])
755772 self .assertEqual (b .grid_info (), {})
756773 b .grid_configure (row = 0 , column = 0 )
757774 info = b .grid_info ()
@@ -886,6 +903,23 @@ def test_grid_size(self):
886903 f .grid_configure (row = 4 , column = 5 )
887904 self .assertEqual (self .root .grid_size (), (6 , 5 ))
888905
906+ def test_grid_content (self ):
907+ self .assertEqual (self .root .grid_content (), [])
908+ a = tkinter .Label (self .root )
909+ a .grid_configure (row = 0 , column = 1 )
910+ b = tkinter .Label (self .root )
911+ b .grid_configure (row = 1 , column = 0 )
912+ c = tkinter .Label (self .root )
913+ c .grid_configure (row = 1 , column = 1 )
914+ d = tkinter .Label (self .root )
915+ d .grid_configure (row = 1 , column = 1 )
916+ self .assertEqual (self .root .grid_content (), [d , c , b , a ])
917+ self .assertEqual (self .root .grid_content (row = 0 ), [a ])
918+ self .assertEqual (self .root .grid_content (row = 1 ), [d , c , b ])
919+ self .assertEqual (self .root .grid_content (column = 0 ), [b ])
920+ self .assertEqual (self .root .grid_content (column = 1 ), [d , c , a ])
921+ self .assertEqual (self .root .grid_content (row = 1 , column = 1 ), [d , c ])
922+
889923 def test_grid_slaves (self ):
890924 self .assertEqual (self .root .grid_slaves (), [])
891925 a = tkinter .Label (self .root )
0 commit comments