replace deprecation usage throughout

ndonkoHenri · ndonkoHenri · commit 243930e5c9e3 · 2026-04-17T10:50:17.000+02:00
diff --git a/sdk/python/examples/controls/types/border/container/main.py b/sdk/python/examples/controls/types/border/container/main.py
@@ -14,15 +14,15 @@ def main(page: ft.Page):
                                 bgcolor=ft.Colors.AMBER,
                                 padding=15,
                                 border=ft.Border.all(10, ft.Colors.PINK_600),
-                                border_radius=ft.border_radius.all(30),
+                                border_radius=ft.BorderRadius.all(30),
                                 width=150,
                                 height=150,
                             ),
                             ft.Container(
                                 bgcolor=ft.Colors.DEEP_PURPLE,
                                 padding=15,
                                 border=ft.Border.all(3, ft.Colors.LIGHT_GREEN_ACCENT),
-                                border_radius=ft.border_radius.only(
+                                border_radius=ft.BorderRadius.only(
                                     top_left=10, bottom_right=10
                                 ),
                                 width=150,
diff --git a/sdk/python/examples/tutorials/solitaire/solitaire-classes/slot.py b/sdk/python/examples/tutorials/solitaire/solitaire-classes/slot.py
@@ -1,8 +1,8 @@
+import flet as ft
+
 SLOT_WIDTH = 70
 SLOT_HEIGHT = 100
 
-import flet as ft
-
 
 class Slot(ft.Container):
     def __init__(self, top, left):
@@ -12,4 +12,4 @@ def __init__(self, top, left):
         self.height = SLOT_HEIGHT
         self.left = left
         self.top = top
-        self.border = ft.border.all(1)
+        self.border = ft.Border.all(1)
diff --git a/sdk/python/examples/tutorials/solitaire/solitaire-drag-and-drop/step2.py b/sdk/python/examples/tutorials/solitaire/solitaire-drag-and-drop/step2.py
@@ -41,7 +41,7 @@ def drop(e: ft.DragEndEvent):
 
         e.control.update()
 
-    slot = ft.Container(width=70, height=100, left=200, top=0, border=ft.border.all(1))
+    slot = ft.Container(width=70, height=100, left=200, top=0, border=ft.Border.all(1))
 
     card = ft.GestureDetector(
         mouse_cursor=ft.MouseCursor.MOVE,
diff --git a/sdk/python/examples/tutorials/solitaire/solitaire-drag-and-drop/step3.py b/sdk/python/examples/tutorials/solitaire/solitaire-drag-and-drop/step3.py
@@ -45,7 +45,7 @@ def drop(e: ft.DragEndEvent):
 
         e.control.update()
 
-    slot = ft.Container(width=70, height=100, left=200, top=0, border=ft.border.all(1))
+    slot = ft.Container(width=70, height=100, left=200, top=0, border=ft.Border.all(1))
 
     card1 = ft.GestureDetector(
         mouse_cursor=ft.MouseCursor.MOVE,
diff --git a/sdk/python/examples/tutorials/solitaire/solitaire-drag-and-drop/step4.py b/sdk/python/examples/tutorials/solitaire/solitaire-drag-and-drop/step4.py
@@ -52,11 +52,11 @@ def drop(e: ft.DragEndEvent):
         bounce_back(solitaire, e.control)
         e.control.update()
 
-    slot0 = ft.Container(width=70, height=100, left=0, top=0, border=ft.border.all(1))
+    slot0 = ft.Container(width=70, height=100, left=0, top=0, border=ft.Border.all(1))
 
-    slot1 = ft.Container(width=70, height=100, left=200, top=0, border=ft.border.all(1))
+    slot1 = ft.Container(width=70, height=100, left=200, top=0, border=ft.Border.all(1))
 
-    slot2 = ft.Container(width=70, height=100, left=300, top=0, border=ft.border.all(1))
+    slot2 = ft.Container(width=70, height=100, left=300, top=0, border=ft.Border.all(1))
 
     slots = [slot0, slot1, slot2]
 
diff --git a/sdk/python/examples/tutorials/solitaire/solitaire-fanned-piles/slot.py b/sdk/python/examples/tutorials/solitaire/solitaire-fanned-piles/slot.py
@@ -1,8 +1,8 @@
+import flet as ft
+
 SLOT_WIDTH = 70
 SLOT_HEIGHT = 100
 
-import flet as ft
-
 
 class Slot(ft.Container):
     def __init__(self, top, left):
@@ -12,4 +12,4 @@ def __init__(self, top, left):
         self.height = SLOT_HEIGHT
         self.left = left
         self.top = top
-        self.border = ft.border.all(1)
+        self.border = ft.Border.all(1)
diff --git a/sdk/python/examples/tutorials/solitaire/solitaire-final-part1/card.py b/sdk/python/examples/tutorials/solitaire/solitaire-final-part1/card.py
@@ -26,7 +26,7 @@ def __init__(self, solitaire, suite, rank):
         self.content = ft.Container(
             width=CARD_WIDTH,
             height=CARD_HEIGHT,
-            border_radius=ft.border_radius.all(6),
+            border_radius=ft.BorderRadius.all(6),
             content=ft.Image(src="/images/card_back.png"),
         )
         self.draggable_pile = [self]
diff --git a/sdk/python/examples/tutorials/solitaire/solitaire-final-part1/slot.py b/sdk/python/examples/tutorials/solitaire/solitaire-final-part1/slot.py
@@ -15,7 +15,7 @@ def __init__(self, solitaire, top, left, border):
         self.on_click = self.click
         self.solitaire = solitaire
         self.border = border
-        self.border_radius = ft.border_radius.all(6)
+        self.border_radius = ft.BorderRadius.all(6)
 
     def get_top_card(self):
         if len(self.pile) > 0:
diff --git a/sdk/python/examples/tutorials/solitaire/solitaire-final-part1/solitaire.py b/sdk/python/examples/tutorials/solitaire/solitaire-final-part1/solitaire.py
@@ -1,12 +1,13 @@
-SOLITAIRE_WIDTH = 1000
-SOLITAIRE_HEIGHT = 500
-
 import random
 
-import flet as ft
 from card import Card
 from slot import Slot
 
+import flet as ft
+
+SOLITAIRE_WIDTH = 1000
+SOLITAIRE_HEIGHT = 500
+
 
 class Suite:
     def __init__(self, suite_name, suite_color):
@@ -62,15 +63,15 @@ def create_card_deck(self):
                 self.cards.append(Card(solitaire=self, suite=suite, rank=rank))
 
     def create_slots(self):
-        self.stock = Slot(solitaire=self, top=0, left=0, border=ft.border.all(1))
+        self.stock = Slot(solitaire=self, top=0, left=0, border=ft.Border.all(1))
 
         self.waste = Slot(solitaire=self, top=0, left=100, border=None)
 
         self.foundations = []
         x = 300
         for i in range(4):
             self.foundations.append(
-                Slot(solitaire=self, top=0, left=x, border=ft.border.all(1, "outline"))
+                Slot(solitaire=self, top=0, left=x, border=ft.Border.all(1, "outline"))
             )
             x += 100
 
diff --git a/sdk/python/examples/tutorials/solitaire/solitaire-final/card.py b/sdk/python/examples/tutorials/solitaire/solitaire-final/card.py
@@ -20,7 +20,7 @@ def __init__(self, solitaire, suite, rank):
         self.content = ft.Container(
             width=70,
             height=100,
-            border_radius=ft.border_radius.all(6),
+            border_radius=ft.BorderRadius.all(6),
             # content=ft.Image(src=f"/images/card_back.svg"),
             content=ft.Image(src=self.solitaire.settings.card_back),
         )
@@ -166,7 +166,10 @@ def place(self, slot):
         self.solitaire.update()
 
     def get_cards_to_move(self):
-        """returns list of cards that will be dragged together, starting with the current card"""
+        """
+        Returns a list of cards that will be dragged together,
+        starting with the current card.
+        """
         if self.slot is not None:
             return self.slot.pile[self.slot.pile.index(self) :]
 
diff --git a/sdk/python/examples/tutorials/solitaire/solitaire-final/settings.py b/sdk/python/examples/tutorials/solitaire/solitaire-final/settings.py
@@ -65,7 +65,7 @@ def generate_card_backs(self):
                     width=70,
                     height=100,
                     content=ft.Image(src=f"/images/card_back{i}.png"),
-                    border_radius=ft.border_radius.all(6),
+                    border_radius=ft.BorderRadius.all(6),
                     on_click=self.choose_card_design,
                     data=i,
                 )
@@ -76,7 +76,7 @@ def choose_card_design(self, e):
         for card in self.card_backs:
             if card.data != e.control.data:
                 card.border = None
-        e.control.border = ft.border.all(3)
+        e.control.border = ft.Border.all(3)
         self.selected_card = e.control
         self.update()
 
diff --git a/sdk/python/examples/tutorials/solitaire/solitaire-final/slot.py b/sdk/python/examples/tutorials/solitaire/solitaire-final/slot.py
@@ -11,7 +11,7 @@ def __init__(self, solitaire, slot_type, top, left, border):
         self.height = 100
         self.left = left
         self.top = top
-        self.border_radius = ft.border_radius.all(6)
+        self.border_radius = ft.BorderRadius.all(6)
         self.border = border
         self.on_click = self.click
 
diff --git a/sdk/python/examples/tutorials/solitaire/solitaire-final/solitaire.py b/sdk/python/examples/tutorials/solitaire/solitaire-final/solitaire.py
@@ -1,10 +1,11 @@
 # from settings import Settings
 import random
 
-import flet as ft
 from card import Card
 from slot import Slot
 
+import flet as ft
+
 
 class Suite:
     def __init__(self, suite_name, suite_color):
@@ -38,7 +39,7 @@ def did_mount(self):
 
     def create_slots(self):
         self.stock = Slot(
-            solitaire=self, slot_type="stock", top=0, left=0, border=ft.border.all(1)
+            solitaire=self, slot_type="stock", top=0, left=0, border=ft.Border.all(1)
         )
 
         self.waste = Slot(
@@ -54,7 +55,7 @@ def create_slots(self):
                     slot_type="foundation",
                     top=0,
                     left=x,
-                    border=ft.border.all(1, "outline"),
+                    border=ft.Border.all(1, "outline"),
                 )
             )
             x += 100
@@ -68,7 +69,7 @@ def create_slots(self):
                     slot_type="tableau",
                     top=150,
                     left=x,
-                    # border=ft.border.all(1),
+                    # border=ft.Border.all(1),
                     border=None,
                 )
             )
diff --git a/sdk/python/examples/tutorials/solitaire/solitaire-game-rules/card.py b/sdk/python/examples/tutorials/solitaire/solitaire-game-rules/card.py
@@ -26,7 +26,7 @@ def __init__(self, solitaire, suite, rank):
         self.content = ft.Container(
             width=CARD_WIDTH,
             height=CARD_HEIGHT,
-            border_radius=ft.border_radius.all(6),
+            border_radius=ft.BorderRadius.all(6),
             content=ft.Image(src="/images/card_back.png"),
         )
         self.draggable_pile = [self]
@@ -84,15 +84,20 @@ def place(self, slot):
         self.solitaire.update()
 
     def get_draggable_pile(self):
-        """returns list of cards that will be dragged together, starting with the current card"""
+        """
+        Returns a list of cards that will be dragged together,
+        starting with the current card.
+        """
 
         if (
             self.slot is not None
             and self.slot != self.solitaire.stock
             and self.slot != self.solitaire.waste
         ):
             self.draggable_pile = self.slot.pile[self.slot.pile.index(self) :]
-        else:  # slot == None when the cards are dealt and need to be place in slot for the first time
+        else:
+            # slot == None when the cards are dealt and
+            # need to be place in slot for the first time
             self.draggable_pile = [self]
 
     def start_drag(self, e: ft.DragStartEvent):
diff --git a/sdk/python/examples/tutorials/solitaire/solitaire-game-rules/slot.py b/sdk/python/examples/tutorials/solitaire/solitaire-game-rules/slot.py
@@ -1,8 +1,8 @@
+import flet as ft
+
 SLOT_WIDTH = 70
 SLOT_HEIGHT = 100
 
-import flet as ft
-
 
 class Slot(ft.Container):
     def __init__(self, solitaire, top, left, border):
@@ -15,7 +15,7 @@ def __init__(self, solitaire, top, left, border):
         self.on_click = self.click
         self.solitaire = solitaire
         self.border = border
-        self.border_radius = ft.border_radius.all(6)
+        self.border_radius = ft.BorderRadius.all(6)
 
     def get_top_card(self):
         if len(self.pile) > 0:
diff --git a/sdk/python/examples/tutorials/solitaire/solitaire-game-rules/solitaire.py b/sdk/python/examples/tutorials/solitaire/solitaire-game-rules/solitaire.py
@@ -1,13 +1,14 @@
-# CARD_OFFSET = 20
-SOLITAIRE_WIDTH = 1000
-SOLITAIRE_HEIGHT = 500
-
 import random
 
-import flet as ft
 from card import Card
 from slot import Slot
 
+import flet as ft
+
+# CARD_OFFSET = 20
+SOLITAIRE_WIDTH = 1000
+SOLITAIRE_HEIGHT = 500
+
 
 class Suite:
     def __init__(self, suite_name, suite_color):
@@ -63,15 +64,15 @@ def create_card_deck(self):
                 self.cards.append(Card(solitaire=self, suite=suite, rank=rank))
 
     def create_slots(self):
-        self.stock = Slot(solitaire=self, top=0, left=0, border=ft.border.all(1))
+        self.stock = Slot(solitaire=self, top=0, left=0, border=ft.Border.all(1))
 
         self.waste = Slot(solitaire=self, top=0, left=100, border=None)
 
         self.foundations = []
         x = 300
         for i in range(4):
             self.foundations.append(
-                Slot(solitaire=self, top=0, left=x, border=ft.border.all(1, "outline"))
+                Slot(solitaire=self, top=0, left=x, border=ft.Border.all(1, "outline"))
             )
             x += 100
 
diff --git a/sdk/python/examples/tutorials/solitaire/solitaire-game-setup/card.py b/sdk/python/examples/tutorials/solitaire/solitaire-game-setup/card.py
@@ -24,7 +24,7 @@ def __init__(self, solitaire, suite, rank):
         self.content = ft.Container(
             width=CARD_WIDTH,
             height=CARD_HEIGHT,
-            border_radius=ft.border_radius.all(6),
+            border_radius=ft.BorderRadius.all(6),
             content=ft.Image(src="/images/card_back.png"),
         )
         self.draggable_pile = [self]
diff --git a/sdk/python/examples/tutorials/solitaire/solitaire-game-setup/slot.py b/sdk/python/examples/tutorials/solitaire/solitaire-game-setup/slot.py
@@ -13,7 +13,7 @@ def __init__(self, top, left, border):
         self.left = left
         self.top = top
         self.border = border
-        self.border_radius = ft.border_radius.all(6)
+        self.border_radius = ft.BorderRadius.all(6)
 
     def get_top_card(self):
         if len(self.pile) > 0:
diff --git a/sdk/python/examples/tutorials/solitaire/solitaire-game-setup/solitaire.py b/sdk/python/examples/tutorials/solitaire/solitaire-game-setup/solitaire.py
@@ -1,13 +1,14 @@
-# CARD_OFFSET = 20
-SOLITAIRE_WIDTH = 1000
-SOLITAIRE_HEIGHT = 500
-
 import random
 
-import flet as ft
 from card import Card
 from slot import Slot
 
+import flet as ft
+
+# CARD_OFFSET = 20
+SOLITAIRE_WIDTH = 1000
+SOLITAIRE_HEIGHT = 500
+
 
 class Suite:
     def __init__(self, suite_name, suite_color):
@@ -63,15 +64,15 @@ def create_card_deck(self):
                 self.cards.append(Card(solitaire=self, suite=suite, rank=rank))
 
     def create_slots(self):
-        self.stock = Slot(top=0, left=0, border=ft.border.all(1))
+        self.stock = Slot(top=0, left=0, border=ft.Border.all(1))
 
         self.waste = Slot(top=0, left=100, border=None)
 
         self.foundations = []
         x = 300
         for i in range(4):
             self.foundations.append(
-                Slot(top=0, left=x, border=ft.border.all(1, "outline"))
+                Slot(top=0, left=x, border=ft.Border.all(1, "outline"))
             )
             x += 100
 
diff --git a/sdk/python/packages/flet/src/flet/controls/material/container.py b/sdk/python/packages/flet/src/flet/controls/material/container.py
@@ -162,7 +162,7 @@ class Container(LayoutControl, AdaptiveControl):
                     width=50,
                     height=50,
                     bgcolor="#44CCCCCC",
-                    border=ft.border.all(2, ft.Colors.BLACK),
+                    border=ft.Border.all(2, ft.Colors.BLACK),
                 ),
             ]
         )
diff --git a/website/blog/2023-05-12-theming-and-scrollables.md b/website/blog/2023-05-12-theming-and-scrollables.md
@@ -52,7 +52,7 @@ def main(page: ft.Page):
         cl.controls.append(ft.Text(f"Text line {i}", key=str(i)))
 
     page.add(
-        ft.Container(cl, border=ft.border.all(1)),
+        ft.Container(cl, border=ft.Border.all(1)),
     )
 
 ft.run(main)
diff --git a/website/docs/cookbook/colors.md b/website/docs/cookbook/colors.md
@@ -166,7 +166,7 @@ def main(page: ft.Page):
         ft.Container(
             width=200,
             height=200,
-            border=ft.border.all(1, ft.Colors.BLACK),
+            border=ft.Border.all(1, ft.Colors.BLACK),
             content=ft.FilledButton("Primary color"),
             theme=ft.Theme(color_scheme=ft.ColorScheme(primary=ft.Colors.YELLOW))
         )
diff --git a/website/docs/cookbook/drag-and-drop.md b/website/docs/cookbook/drag-and-drop.md
diff --git a/website/docs/cookbook/large-lists.md b/website/docs/cookbook/large-lists.md
diff --git a/website/docs/extend/user-extensions.md b/website/docs/extend/user-extensions.md
diff --git a/website/docs/tutorials/chat.md b/website/docs/tutorials/chat.md
diff --git a/website/docs/tutorials/solitaire.md b/website/docs/tutorials/solitaire.md
diff --git a/website/docs/types/borderradius.md b/website/docs/types/borderradius.md

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ def __init__(self, solitaire, suite, rank):`
`26`	`26`	`self.content = ft.Container(`
`27`	`27`	`width=CARD_WIDTH,`
`28`	`28`	`height=CARD_HEIGHT,`
`29`		`- border_radius=ft.border_radius.all(6),`
	`29`	`+ border_radius=ft.BorderRadius.all(6),`
`30`	`30`	`content=ft.Image(src="/images/card_back.png"),`
`31`	`31`	`)`
`32`	`32`	`self.draggable_pile = [self]`