Skip to content

Commit 825bcea

Browse files
authored
Merge branch 'CodeMouse92:main' into main
2 parents 143cb2b + f9c2933 commit 825bcea

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

Ch03/augmented_assignment_operators.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
foo //= 5 # value is now 48 (240 // 5)
66
foo /= 4 # value is now 144.0 (48 / 4)
77
foo **= 2 # value is now 144.0 (12.0 ** 2)
8-
foo %= 51 # value is now 42.0 (144.0 % 15)
8+
foo %= 51 # value is now 42.0 (144.0 % 51)

Ch03/literal_curly_braces.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
answer = 42
2-
print(f"{{answer}}") # prints "{42}"
3-
print(f"{{{{answer}}}}") # prints "{{42}}"
4-
print(f"{{{{{{answer}}}}}}") # prints "{{{42}}}"
2+
print(f"{{{answer}}}") # prints "{42}"
3+
print(f"{{{{{answer}}}}}") # prints "{{42}}"
4+
print(f"{{{{{{{answer}}}}}") # prints "{{{42}}}"

Ch15/element_generic.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
from functools import singledispatchmethod
2-
from typing import overload
32

43

54
class Element:
@@ -32,9 +31,10 @@ def __eq__(self, other):
3231
def _(self, other: str):
3332
return self.symbol == other
3433

35-
@overload
34+
@__eq__.register
3635
def _(self, other: float):
37-
...
36+
return self.number == other
37+
3838
@__eq__.register
3939
def _(self, other: int):
4040
return self.number == other
@@ -93,7 +93,7 @@ def __str__(self):
9393
if 'C' in formula.keys():
9494
s += f"C{formula['C']}"
9595
del formula['C']
96-
if 1 in formula.keys():
96+
if 'H' in formula.keys():
9797
s += f"H{formula['H']}"
9898
del formula['H']
9999
for element, count in sorted(formula.items()):
@@ -106,7 +106,7 @@ def __repr__(self):
106106
return f"{self.name}: {self}"
107107

108108

109-
hydrogen = Element('H', 6, 'hydrogen')
109+
hydrogen = Element('H', 1, 'hydrogen')
110110
carbon = Element('C', 6, 'carbon')
111111
oxygen = Element('O', 8, 'oxygen')
112112
iron = Element('Fe', 26, 'iron')

0 commit comments

Comments
 (0)