Merge branch 'master' into functional-programming

Author: brendaweles

python-string/format_template.py

@@ -0,0 +1,33 @@
+debit = 300.00
+credit = 450.00
+
+template = """
+Account Report
+Credit:  ${credit:.2f}
+Debit:  -${debit:.2f}
+________________
+Balance: ${balance:.2f}"""
+
+print(
+    template.format(
+        credit=credit,
+        debit=debit,
+        balance=credit - debit,
+    )
+)
+
+template = """
+Account Report
+Credit:  $%(credit).2f
+Debit:  -$%(debit).2f
+________________
+Balance: $%(balance).2f"""
+
+print(
+    template
+    % {
+        "credit": credit,
+        "debit": debit,
+        "balance": credit - debit,
+    }
+)

python-string/formatting copy.py

@@ -1,33 +1,5 @@
-debit = 300.00
-credit = 450.00
+from datetime import datetime
 
-template = """
-Account Report
-Credit:  ${credit:.2f}
-Debit:  -${debit:.2f}
-________________
-Balance: ${balance:.2f}"""
-
-print(
-    template.format(
-        credit=credit,
-        debit=debit,
-        balance=credit - debit,
-    )
-)
-
-template = """
-Account Report
-Credit:  $%(credit).2f
-Debit:  -$%(debit).2f
-________________
-Balance: $%(balance).2f"""
-
-print(
-    template
-    % {
-        "credit": credit,
-        "debit": debit,
-        "balance": credit - debit,
-    }
-)
+print(format(1000000, ",.2f"))  # Thousand separators
+print(format("Header", "=^30"))  # Centered and filled
+print(format(datetime.now(), "%a %b %d, %Y"))  # Date

python-string/formatting.py

@@ -1,10 +1,10 @@
 def display_table(data, headers):
     max_len = max(len(header) for header in headers)
-    print("|".join(header.ljust(max_len) for header in headers))
+    print(" | ".join(header.ljust(max_len) for header in headers))
     sep = "-" * max_len
-    print("|".join(sep for _ in headers))
+    print("-|-".join(sep for _ in headers))
     for row in data:
-        print("|".join(header.ljust(max_len) for header in row))
+        print(" | ".join(header.ljust(max_len) for header in row))
 
 
 data = [