Merge 5f3ccda520 into 7a094cec63

README-ja.md

@@ -1172,7 +1172,7 @@ def get_user(self, user_id):
     if user is None:
         user = db.query("SELECT * FROM users WHERE user_id = {0}", user_id)
         if user is not None:
-            key = "user.{0}".format(user_id)
+            key = f"user.{user_id}"
             cache.set(key, json.dumps(user))
     return user
 ```

README-zh-Hans.md

@@ -1181,7 +1181,7 @@ def get_user(self, user_id):
     if user is None:
         user = db.query("SELECT * FROM users WHERE user_id = {0}", user_id)
         if user is not None:
-            key = "user.{0}".format(user_id)
+            key = f"user.{user_id}"
             cache.set(key, json.dumps(user))
     return user
 ```

README-zh-TW.md

@@ -1173,7 +1173,7 @@ def get_user(self, user_id):
     if user is None:
         user = db.query("SELECT * FROM users WHERE user_id = {0}", user_id)
         if user is not None:
-            key = "user.{0}".format(user_id)
+            key = f"user.{user_id}"
             cache.set(key, json.dumps(user))
     return user
 ```

README.md

@@ -1221,7 +1221,7 @@ def get_user(self, user_id):
     if user is None:
         user = db.query("SELECT * FROM users WHERE user_id = {0}", user_id)
         if user is not None:
-            key = "user.{0}".format(user_id)
+            key = f"user.{user_id}"
             cache.set(key, json.dumps(user))
     return user
 ```

solutions/object_oriented_design/call_center/call_center.ipynb

@@ -158,7 +158,7 @@
     "\n",
     "    def dispatch_call(self, call):\n",
     "        if call.rank not in (Rank.OPERATOR, Rank.SUPERVISOR, Rank.DIRECTOR):\n",
-    "            raise ValueError('Invalid call rank: {}'.format(call.rank))\n",
+    "            raise ValueError(f'Invalid call rank: {call.rank}')\n",
     "        employee = None\n",
     "        if call.rank == Rank.OPERATOR:\n",
     "            employee = self._dispatch_call(call, self.operators)\n",

solutions/object_oriented_design/call_center/call_center.py

@@ -94,7 +94,7 @@ class CallCenter(object):
 
     def dispatch_call(self, call):
         if call.rank not in (Rank.OPERATOR, Rank.SUPERVISOR, Rank.DIRECTOR):
-            raise ValueError('Invalid call rank: {}'.format(call.rank))
+            raise ValueError(f'Invalid call rank: {call.rank}')
         employee = None
         if call.rank == Rank.OPERATOR:
             employee = self._dispatch_call(call, self.operators)

solutions/object_oriented_design/deck_of_cards/deck_of_cards.ipynb

@@ -109,7 +109,7 @@
     "        if 1 <= new_value <= 13:\n",
     "            self._value = new_value\n",
     "        else:\n",
-    "            raise ValueError('Invalid card value: {}'.format(new_value))\n",
+    "            raise ValueError(f'Invalid card value: {new_value}')\n",
     "\n",
     "\n",
     "class Hand(object):\n",

solutions/object_oriented_design/deck_of_cards/deck_of_cards.py

@@ -55,7 +55,7 @@ class BlackJackCard(Card):
         if 1 <= new_value <= 13:
             self._value = new_value
         else:
-            raise ValueError('Invalid card value: {}'.format(new_value))
+            raise ValueError(f'Invalid card value: {new_value}')
 
 
 class Hand(object):