Release 2.0.0

[pinch] / pinch.py

diff --git a/pinch.py b/pinch.py
index 37d37a7c137727bed59251a0b0b1619f19cbeab7..b5e3b81567894101a9ee0d9cc9de34f253c15dd1 100644 (file)
--- a/pinch.py
+++ b/pinch.py
@@ -124,7 +124,7 @@ def copy_to_nix_store(v: Verification, filename: str) -> str:
     process = subprocess.run(
         ['nix-store', '--add', filename], stdout=subprocess.PIPE)
     v.result(process.returncode == 0)
     process = subprocess.run(
         ['nix-store', '--add', filename], stdout=subprocess.PIPE)
     v.result(process.returncode == 0)

-    return process.stdout.decode().strip()
+    return process.stdout.decode().strip()  # type: ignore  # (for old mypy)

 
 
 class AliasSearchPath(NamedTuple):
 
 
 class AliasSearchPath(NamedTuple):


@@ -238,7 +238,7 @@ def fetch_channel(
         v: Verification, channel: ChannelSearchPath) -> Tuple[str, str]:
     v.status('Fetching channel')
     request = urllib.request.urlopen(channel.channel_url, timeout=10)
         v: Verification, channel: ChannelSearchPath) -> Tuple[str, str]:
     v.status('Fetching channel')
     request = urllib.request.urlopen(channel.channel_url, timeout=10)

-    channel_html = request.read()
+    channel_html = request.read().decode()

     forwarded_url = request.geturl()
     v.result(request.status == 200)  # type: ignore  # (for old mypy)
     v.check('Got forwarded', channel.channel_url != forwarded_url)
     forwarded_url = request.geturl()
     v.result(request.status == 200)  # type: ignore  # (for old mypy)
     v.check('Got forwarded', channel.channel_url != forwarded_url)


@@ -651,7 +651,7 @@ def read_config_section(
     pin_fields, remaining_fields = filter_dict(all_fields, set(P._fields))
     # Error suppression works around https://github.com/python/mypy/issues/9007
     pin_present = pin_fields != {} or P._fields == ()
     pin_fields, remaining_fields = filter_dict(all_fields, set(P._fields))
     # Error suppression works around https://github.com/python/mypy/issues/9007
     pin_present = pin_fields != {} or P._fields == ()

-    pin = P(**pin_fields) if pin_present else None  # type:ignore[call-arg]
+    pin = P(**pin_fields) if pin_present else None  # type: ignore

     return SP(**remaining_fields), pin
 
 
     return SP(**remaining_fields), pin