sync from Atlas

ramalho · ramalho · commit 6fb0832c4041 · 2021-10-12T22:37:28.000-03:00
diff --git a/02-array-seq/lispy/py3.10/examples_test.py b/02-array-seq/lispy/py3.10/examples_test.py
@@ -147,7 +147,7 @@ def test_factorial():
 
 gcd_src = """
 (define (mod m n)
-    (- m (* n (// m n))))
+    (- m (* n (quotient m n))))
 (define (gcd m n)
     (if (= n 0)
         m
diff --git a/02-array-seq/lispy/py3.9/lis.py b/02-array-seq/lispy/py3.9/lis.py
@@ -80,7 +80,7 @@ def standard_env() -> Environment:
             '-': op.sub,
             '*': op.mul,
             '/': op.truediv,
-            '//': op.floordiv,
+            'quotient': op.floordiv,
             '>': op.gt,
             '<': op.lt,
             '>=': op.ge,
diff --git a/18-with-match/lispy/py3.10/examples_test.py b/18-with-match/lispy/py3.10/examples_test.py
@@ -146,7 +146,7 @@ def test_factorial():
 
 gcd_src = """
 (define (mod m n)
-    (- m (* n (// m n))))
+    (- m (* n (quotient m n))))
 (define (gcd m n)
     (if (= n 0)
         m
diff --git a/18-with-match/lispy/py3.10/lis.py b/18-with-match/lispy/py3.10/lis.py
@@ -83,7 +83,7 @@ def standard_env() -> Environment:
             '-': op.sub,
             '*': op.mul,
             '/': op.truediv,
-            '//': op.floordiv,
+            'quotient': op.floordiv,
             '>': op.gt,
             '<': op.lt,
             '>=': op.ge,
diff --git a/18-with-match/lispy/py3.9/examples_test.py b/18-with-match/lispy/py3.9/examples_test.py
@@ -147,7 +147,7 @@ def test_factorial():
 
 gcd_src = """
 (define (mod m n)
-    (- m (* n (// m n))))
+    (- m (* n (quotient m n))))
 (define (gcd m n)
     (if (= n 0)
         m
@@ -255,4 +255,4 @@ def test_closure_with_change(capsys):
 def test_closure_averager():
     got = run(closure_averager_src)
     assert got == 12.0
-# end::RUN_AVERAGER[]
+# end::RUN_AVERAGER[]
diff --git a/18-with-match/lispy/py3.9/lis.py b/18-with-match/lispy/py3.9/lis.py
@@ -80,7 +80,7 @@ def standard_env() -> Environment:
             '-': op.sub,
             '*': op.mul,
             '/': op.truediv,
-            '//': op.floordiv,
+            'quotient': op.floordiv,
             '>': op.gt,
             '<': op.lt,
             '>=': op.ge,
diff --git a/20-executors/getflags/flags2_asyncio.py b/20-executors/getflags/flags2_asyncio.py
@@ -16,37 +16,36 @@
 
 from flags2_common import main, DownloadStatus, save_flag
 
-# default set low to avoid errors from remote site, such as
-# 503 - Service Temporarily Unavailable
+# low concurrency default to avoid errors from remote site,
+# such as 503 - Service Temporarily Unavailable
 DEFAULT_CONCUR_REQ = 5
 MAX_CONCUR_REQ = 1000
 
-async def get_flag(session: httpx.AsyncClient,  # <2>
+async def get_flag(client: httpx.AsyncClient,  # <1>
                    base_url: str,
                    cc: str) -> bytes:
     url = f'{base_url}/{cc}/{cc}.gif'.lower()
-    resp = await session.get(url, timeout=3.1, follow_redirects=True)   # <3>
+    resp = await client.get(url, timeout=3.1, follow_redirects=True)   # <2>
     resp.raise_for_status()
     return resp.content
 
-async def download_one(session: httpx.AsyncClient,
+async def download_one(client: httpx.AsyncClient,
                        cc: str,
                        base_url: str,
-                       semaphore: asyncio.Semaphore,  # <4>
+                       semaphore: asyncio.Semaphore,
                        verbose: bool) -> DownloadStatus:
     try:
-        async with semaphore:  # <5>
-            image = await get_flag(session, base_url, cc)
-    except httpx.HTTPStatusError as exc:  # <4>
+        async with semaphore:  # <3>
+            image = await get_flag(client, base_url, cc)
+    except httpx.HTTPStatusError as exc:  # <5>
         res = exc.response
         if res.status_code == HTTPStatus.NOT_FOUND:
-            status = DownloadStatus.NOT_FOUND  # <5>
+            status = DownloadStatus.NOT_FOUND
             msg = f'not found: {res.url}'
         else:
             raise
-
     else:
-        await asyncio.to_thread(save_flag, image, f'{cc}.gif')
+        await asyncio.to_thread(save_flag, image, f'{cc}.gif')  # <6>
         status = DownloadStatus.OK
         msg = 'OK'
     if verbose and msg:
@@ -61,33 +60,31 @@ async def supervisor(cc_list: list[str],
                      concur_req: int) -> Counter[DownloadStatus]:  # <1>
     counter: Counter[DownloadStatus] = Counter()
     semaphore = asyncio.Semaphore(concur_req)  # <2>
-    async with httpx.AsyncClient() as session:
-        to_do = [download_one(session, cc, base_url, semaphore, verbose)
+    async with httpx.AsyncClient() as client:
+        to_do = [download_one(client, cc, base_url, semaphore, verbose)
                  for cc in sorted(cc_list)]  # <3>
         to_do_iter = asyncio.as_completed(to_do)  # <4>
         if not verbose:
             to_do_iter = tqdm.tqdm(to_do_iter, total=len(cc_list))  # <5>
-        error: httpx.HTTPError | None = None
-        for coro in to_do_iter:  # <6>
+        error: httpx.HTTPError | None = None  # <6>
+        for coro in to_do_iter:  # <7>
             try:
-                status = await coro  # <7>
-            except httpx.HTTPStatusError as exc:  # <8>
+                status = await coro  # <8>
+            except httpx.HTTPStatusError as exc:
                 error_msg = 'HTTP error {resp.status_code} - {resp.reason_phrase}'
                 error_msg = error_msg.format(resp=exc.response)
-                error = exc
-            except httpx.RequestError as exc:  # <9>
+                error = exc  # <9>
+            except httpx.RequestError as exc:
                 error_msg = f'{exc} {type(exc)}'.strip()
-                error = exc
-            except KeyboardInterrupt:  # <10>
+                error = exc  # <10>
+            except KeyboardInterrupt:
                 break
-            else:  # <11>
-                error = None
 
             if error:
-                status = DownloadStatus.ERROR  # <12>
+                status = DownloadStatus.ERROR  # <11>
                 if verbose:
-                    url = str(error.request.url)  # <13>
-                    cc = Path(url).stem.upper()   # <14>
+                    url = str(error.request.url)  # <12>
+                    cc = Path(url).stem.upper()   # <13>
                     print(f'{cc} error: {error_msg}')
             counter[status] += 1
 

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ def test_factorial():`
`147`	`147`
`148`	`148`	`gcd_src = """`
`149`	`149`	`(define (mod m n)`
`150`		`- (- m (* n (// m n))))`
	`150`	`+ (- m (* n (quotient m n))))`
`151`	`151`	`(define (gcd m n)`
`152`	`152`	`(if (= n 0)`
`153`	`153`	`m`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ def test_factorial():`
`146`	`146`
`147`	`147`	`gcd_src = """`
`148`	`148`	`(define (mod m n)`
`149`		`- (- m (* n (// m n))))`
	`149`	`+ (- m (* n (quotient m n))))`
`150`	`150`	`(define (gcd m n)`
`151`	`151`	`(if (= n 0)`
`152`	`152`	`m`