Merge pull request faif#336 from rednafi/master

faif · web-flow · commit 2076cbcc7d44 · 2020-07-04T13:22:41.000+02:00
Added type hints to composite pattern
diff --git a/patterns/structural/composite.py b/patterns/structural/composite.py
@@ -26,33 +26,37 @@
 Describes a group of objects that is treated as a single instance.
 """
 
+from abc import ABC, abstractmethod
+from typing import List
 
-class Graphic:
- def render(self):
- raise NotImplementedError("You should implement this.")
+
+class Graphic(ABC):
+ @abstractmethod
+ def render(self) -> None:
+ raise NotImplementedError("You should implement this!")
 
 
 class CompositeGraphic(Graphic):
- def __init__(self):
- self.graphics = []
+ def __init__(self) -> None:
+ self.graphics: List[Graphic] = []
 
- def render(self):
+ def render(self) -> None:
 for graphic in self.graphics:
 graphic.render()
 
- def add(self, graphic):
+ def add(self, graphic: Graphic) -> None:
 self.graphics.append(graphic)
 
- def remove(self, graphic):
+ def remove(self, graphic: Graphic) -> None:
 self.graphics.remove(graphic)
 
 
 class Ellipse(Graphic):
- def __init__(self, name):
+ def __init__(self, name: str) -> None:
 self.name = name
 
- def render(self):
- print("Ellipse:{}".format(self.name))
+ def render(self) -> None:
+ print(f"Ellipse:{self.name}")
 
 
 def main():

-Original file line number
+Diff line change
 Describes a group of objects that is treated as a single instance.
 """
 +fromabcimportABC, abstractmethod
 +fromtypingimportList
 -classGraphic:
 -defrender(self):
 -raiseNotImplementedError("You should implement this.")
++
 +classGraphic(ABC):
 +@abstractmethod
 +defrender(self) ->None:
 +raiseNotImplementedError("You should implement this!")
 classCompositeGraphic(Graphic):
 -def__init__(self):
 -self.graphics= []
 +def__init__(self)->None:
 +self.graphics: List[Graphic]= []
 -defrender(self):
 +defrender(self)->None:
 forgraphicinself.graphics:
 graphic.render()
 -defadd(self, graphic):
 +defadd(self, graphic: Graphic) ->None:
 self.graphics.append(graphic)
 -defremove(self, graphic):
 +defremove(self, graphic: Graphic) ->None:
 self.graphics.remove(graphic)
 classEllipse(Graphic):
 -def__init__(self, name):
 +def__init__(self, name: str) ->None:
 self.name=name
 -defrender(self):
 -print("Ellipse:{}".format(self.name))
 +defrender(self)->None:
 +print(f"Ellipse: {self.name}")
 defmain():