Merge branch 'master' into where

Author: bzaczynski

primer-on-jinja-templating/requirements.txt

@@ -1,6 +1,7 @@
-click==8.1.3
-Flask==2.1.2
-itsdangerous==2.1.2
-Jinja2==3.1.2
-MarkupSafe==2.1.1
-Werkzeug==2.1.2
+blinker==1.8.2
+click==8.1.7
+Flask==3.0.3
+itsdangerous==2.2.0
+Jinja2==3.1.4
+MarkupSafe==2.1.5
+Werkzeug==3.0.3

python-class/car.py

@@ -34,7 +34,7 @@ def brake(self, value):
         print(f"Braking to {self.speed} km/h...")
 
     def __str__(self):
-        return f"{self.make}, {self.model}, {self.color}: ({self.year})"
+        return f"{self.make} {self.model}, {self.color} ({self.year})"
 
     def __repr__(self):
         return (

python-class/circle.py

@@ -16,4 +16,4 @@ def radius(self, value):
         self._radius = value
 
     def area(self):
-        return round(math.pi * self._radius**2, 2)
+        return math.pi * self._radius**2

python-class/mro.py

@@ -1,16 +1,16 @@
 class A:
     def method(self):
-        print("A.method")
+        print("A.method()")
 
 
 class B(A):
     def method(self):
-        print("B.method")
+        print("B.method()")
 
 
 class C(A):
     def method(self):
-        print("C.method")
+        print("C.method()")
 
 
 class D(B, C):

python-class/robot.py

@@ -37,11 +37,11 @@ def __init__(self):
         self.position = 0
 
     def move_up(self, distance=1):
-        self.position += 1
+        self.position += distance
         print(f"Moving arm {distance} cm up...")
 
     def move_down(self, distance=1):
-        self.position -= 1
+        self.position -= distance
         print(f"Moving arm {distance} cm down...")
 
     def weld(self):

python-class/shapes.py

@@ -21,7 +21,7 @@ def __init__(self, radius):
         self.radius = radius
 
     def area(self):
-        return round(math.pi * self.radius**2, 2)
+        return math.pi * self.radius**2
 
 
 class Square:
@@ -31,4 +31,4 @@ def __init__(self, side):
         self.side = side
 
     def area(self):
-        return round(self.side**2, 2)
+        return self.side**2

python-class/square.py

@@ -13,4 +13,4 @@ def side(self, value):
         self._side = value
 
     def calculate_area(self):
-        return round(self._side**2, 2)
+        return self._side**2