updated from Atlas

Author: ramalho

02-array-seq/lispy/README.md

@@ -23,4 +23,14 @@ The copyright holder is Peter Norvig and the code is licensed under the
 [MIT license](https://github.com/norvig/pytudes/blob/60168bce8cdfacf57c92a5b2979f0b2e95367753/LICENSE).
 
 
+## Changes to Norvig's code
+
+I made small changes to the programs in `original/`:
+
+* In `lis.py`:
+  * The `Procedure` class accepts a list of expressions as the `body`, and `__call__` evaluates those expressions in order, and returns the value of the last. This is consistent with Scheme's `lambda` syntax and provided a useful example for pattern matching.
+  * In the `elif` block for `'lambda'`, I added the `*` in front of the `*body` variable in the tuple unpacking to capture the expressions as a list, before calling the `Procedure` constructor.
+
+* In `lispy.py` I made [changes and a pull request](https://github.com/norvig/pytudes/pull/106) to make it run on Python 3.
+
 _Luciano Ramalho<br/>June 29, 2021_

04-text-byte/charfinder/README.rst

@@ -58,7 +58,7 @@ Test ``find`` with single result::
 
 Test ``find`` with two results::
 
-    >>> find('chess', 'queen', last=0xFFFF)  # doctest:+NORMALIZE_WHITESPACE
+    >>> find('chess', 'queen', end=0xFFFF)  # doctest:+NORMALIZE_WHITESPACE
     U+2655	♕	WHITE CHESS QUEEN
     U+265B	♛	BLACK CHESS QUEEN
 

04-text-byte/charfinder/cf.py

@@ -2,11 +2,11 @@
 import sys
 import unicodedata
 
-FIRST, LAST = ord(' '), sys.maxunicode              # <1>
+START, END = ord(' '), sys.maxunicode + 1           # <1>
 
-def find(*query_words, first=FIRST, last=LAST):     # <2>
+def find(*query_words, start=START, end=END):       # <2>
     query = {w.upper() for w in query_words}        # <3>
-    for code in range(first, last + 1):
+    for code in range(start, end):
         char = chr(code)                            # <4>
         name = unicodedata.name(char, None)         # <5>
         if name and query.issubset(name.split()):   # <6>

05-data-classes/dataclass/club.py

@@ -1,9 +1,7 @@
 from dataclasses import dataclass, field
 
-
 @dataclass
 class ClubMember:
-
     name: str
     guests: list = field(default_factory=list)
 

05-data-classes/dataclass/club_wrong.py

@@ -3,7 +3,6 @@
 # tag::CLUBMEMBER[]
 @dataclass
 class ClubMember:
-
     name: str
     guests: list = []
 # end::CLUBMEMBER[]

05-data-classes/dataclass/hackerclub.py

@@ -34,9 +34,7 @@
 
 @dataclass
 class HackerClubMember(ClubMember):                         # <1>
-
     all_handles = set()                                     # <2>
-
     handle: str = ''                                        # <3>
 
     def __post_init__(self):

05-data-classes/dataclass/hackerclub_annotated.py

@@ -35,9 +35,7 @@
 
 @dataclass
 class HackerClubMember(ClubMember):
-
     all_handles: ClassVar[set[str]] = set()
-
     handle: str = ''
 
     def __post_init__(self):

05-data-classes/dataclass/resource.py

@@ -32,7 +32,7 @@
 from datetime import date
 
 
-class ResourceType(Enum):                              # <1>
+class ResourceType(Enum):  # <1>
     BOOK = auto()
     EBOOK = auto()
     VIDEO = auto()

05-data-classes/meaning/demo_dc.py

@@ -2,7 +2,6 @@
 
 @dataclass
 class DemoDataClass:
-
     a: int           # <1>
     b: float = 1.1   # <2>
     c = 'spam'       # <3>

05-data-classes/meaning/demo_nt.py

@@ -1,7 +1,6 @@
 import typing
 
 class DemoNTClass(typing.NamedTuple):
-
     a: int           # <1>
     b: float = 1.1   # <2>
     c = 'spam'       # <3>

05-data-classes/meaning/demo_plain.py

@@ -1,5 +1,4 @@
 class DemoPlainClass:
-
     a: int           # <1>
     b: float = 1.1   # <2>
     c = 'spam'       # <3>

05-data-classes/typing_namedtuple/coordinates.py

@@ -11,7 +11,6 @@
 from typing import NamedTuple
 
 class Coordinate(NamedTuple):
-
     lat: float
     lon: float
 

05-data-classes/typing_namedtuple/coordinates2.py

@@ -13,8 +13,7 @@
 from typing import NamedTuple
 
 class Coordinate(NamedTuple):
-
     lat: float                # <1>
     lon: float
     reference: str = 'WGS84'  # <2>
-# end::COORDINATE[]
+# end::COORDINATE[]

05-data-classes/typing_namedtuple/nocheck_demo.py

@@ -1,7 +1,6 @@
 import typing
 
 class Coordinate(typing.NamedTuple):
-
     lat: float
     lon: float
 

07-1class-func/clip.py

@@ -15,7 +15,7 @@
 import sys
 import re
 import unicodedata
-from typing import Dict, Set, Iterator
+from collections.abc import Iterator
 
 RE_WORD = re.compile(r'\w+')
 STOP_CODE = sys.maxunicode + 1
@@ -25,8 +25,8 @@ def tokenize(text: str) -> Iterator[str]:  # <1>
     for match in RE_WORD.finditer(text):
         yield match.group().upper()
 
-def name_index(start: int = 32, end: int = STOP_CODE) -> Dict[str, Set[str]]:
-    index: Dict[str, Set[str]] = {}  # <2>
+def name_index(start: int = 32, end: int = STOP_CODE) -> dict[str, set[str]]:
+    index: dict[str, set[str]] = {}  # <2>
     for char in (chr(i) for i in range(start, end)):
         if name := unicodedata.name(char, ''):  # <3>
             for word in tokenize(name):

07-1class-func/clip_introspection.rst

@@ -1,4 +1,4 @@
-from typing import Tuple, Mapping
+from collections.abc import Mapping
 
 NAMES = {
     'aqua': 65535,
@@ -19,15 +19,15 @@
     'yellow': 16776960,
 }
 
-def rgb2hex(color=Tuple[int, int, int]) -> str:
+def rgb2hex(color: tuple[int, int, int]) -> str:
     if any(c not in range(256) for c in color):
         raise ValueError('Color components must be in range(256)')
     values = (f'{n % 256:02x}' for n in color)
     return '#' + ''.join(values)
 
 HEX_ERROR = "Color must use format '#0099ff', got: {!r}"
 
-def hex2rgb(color=str) -> Tuple[int, int, int]:
+def hex2rgb(color: str) -> tuple[int, int, int]:
     if len(color) != 7 or color[0] != '#':
         raise ValueError(HEX_ERROR.format(color))
     try:

07-1class-func/clip_signature.rst

@@ -1,7 +1,7 @@
 # tag::COLUMNIZE[]
-from typing import Sequence, List, Tuple
+from collections.abc import Sequence
 
-def columnize(sequence: Sequence[str], num_columns: int = 0) -> List[Tuple[str, ...]]:
+def columnize(sequence: Sequence[str], num_columns: int = 0) -> list[tuple[str, ...]]:
     if num_columns == 0:
         num_columns = round(len(sequence) ** .5)
     num_rows, reminder = divmod(len(sequence), num_columns)