Minor non-functional changes

- fix few typos
- remove unused imports
- fix minor code-quality issues
- replace `grpclib._protocols` with `grpclib._typing`
- fix boolean and None assertions in test cases

betterproto/tests/generate.py

@@ -3,7 +3,6 @@ import asyncio
 import os
 from pathlib import Path
 import shutil
-import subprocess
 import sys
 from typing import Set
 

betterproto/tests/grpc/test_grpclib_client.py

@@ -3,7 +3,6 @@ from betterproto.tests.output_betterproto.service.service import (
     DoThingResponse,
     DoThingRequest,
     GetThingRequest,
-    GetThingResponse,
     TestStub as ThingServiceClient,
 )
 import grpclib
@@ -18,14 +17,14 @@ async def _test_client(client, name="clean room", **kwargs):
     assert response.names == [name]
 
 
-def _assert_request_meta_recieved(deadline, metadata):
+def _assert_request_meta_received(deadline, metadata):
     def server_side_test(stream):
         assert stream.deadline._timestamp == pytest.approx(
             deadline._timestamp, 1
-        ), "The provided deadline should be recieved serverside"
+        ), "The provided deadline should be received serverside"
         assert (
             stream.metadata["authorization"] == metadata["authorization"]
-        ), "The provided authorization metadata should be recieved serverside"
+        ), "The provided authorization metadata should be received serverside"
 
     return server_side_test
 
@@ -42,7 +41,7 @@ async def test_service_call_with_upfront_request_params():
     deadline = grpclib.metadata.Deadline.from_timeout(22)
     metadata = {"authorization": "12345"}
     async with ChannelFor(
-        [ThingService(test_hook=_assert_request_meta_recieved(deadline, metadata),)]
+        [ThingService(test_hook=_assert_request_meta_received(deadline, metadata),)]
     ) as channel:
         await _test_client(
             ThingServiceClient(channel, deadline=deadline, metadata=metadata)
@@ -53,7 +52,7 @@ async def test_service_call_with_upfront_request_params():
     deadline = grpclib.metadata.Deadline.from_timeout(timeout)
     metadata = {"authorization": "12345"}
     async with ChannelFor(
-        [ThingService(test_hook=_assert_request_meta_recieved(deadline, metadata),)]
+        [ThingService(test_hook=_assert_request_meta_received(deadline, metadata),)]
     ) as channel:
         await _test_client(
             ThingServiceClient(channel, timeout=timeout, metadata=metadata)
@@ -70,7 +69,7 @@ async def test_service_call_lower_level_with_overrides():
     kwarg_deadline = grpclib.metadata.Deadline.from_timeout(28)
     kwarg_metadata = {"authorization": "12345"}
     async with ChannelFor(
-        [ThingService(test_hook=_assert_request_meta_recieved(deadline, metadata),)]
+        [ThingService(test_hook=_assert_request_meta_received(deadline, metadata),)]
     ) as channel:
         client = ThingServiceClient(channel, deadline=deadline, metadata=metadata)
         response = await client._unary_unary(
@@ -92,7 +91,7 @@ async def test_service_call_lower_level_with_overrides():
     async with ChannelFor(
         [
             ThingService(
-                test_hook=_assert_request_meta_recieved(kwarg_deadline, kwarg_metadata),
+                test_hook=_assert_request_meta_received(kwarg_deadline, kwarg_metadata),
             )
         ]
     ) as channel:
@@ -140,8 +139,8 @@ async def test_async_gen_for_stream_stream_request():
             assert response.version == response_index + 1
             response_index += 1
             if more_things:
-                # Send some more requests as we recieve reponses to be sure coordination of
-                # send/recieve events doesn't matter
+                # Send some more requests as we receive responses to be sure coordination of
+                # send/receive events doesn't matter
                 await request_chan.send(GetThingRequest(more_things.pop(0)))
             elif not send_initial_requests.done():
                 # Make sure the sending task it completed
@@ -151,4 +150,4 @@ async def test_async_gen_for_stream_stream_request():
                 request_chan.close()
         assert response_index == len(
             expected_things
-        ), "Didn't recieve all exptected responses"
+        ), "Didn't receive all expected responses"

betterproto/tests/grpc/thing_service.py

@@ -3,10 +3,10 @@ from betterproto.tests.output_betterproto.service.service import (
     DoThingRequest,
     GetThingRequest,
     GetThingResponse,
-    TestStub as ThingServiceClient,
 )
 import grpclib
-from typing import Any, Dict
+import grpclib.server
+from typing import Dict
 
 
 class ThingService:

betterproto/tests/inputs/googletypes_response/test_googletypes_response.py

@@ -21,7 +21,7 @@ test_cases = [
 
 @pytest.mark.asyncio
 @pytest.mark.parametrize(["service_method", "wrapper_class", "value"], test_cases)
-async def test_channel_recieves_wrapped_type(
+async def test_channel_receives_wrapped_type(
     service_method: Callable[[TestStub], Any], wrapper_class: Callable, value
 ):
     wrapped_value = wrapper_class()

betterproto/tests/test_features.py

@@ -14,23 +14,23 @@ def test_has_field():
 
     # Unset by default
     foo = Foo()
-    assert betterproto.serialized_on_wire(foo.bar) == False
+    assert betterproto.serialized_on_wire(foo.bar) is False
 
     # Serialized after setting something
     foo.bar.baz = 1
-    assert betterproto.serialized_on_wire(foo.bar) == True
+    assert betterproto.serialized_on_wire(foo.bar) is True
 
     # Still has it after setting the default value
     foo.bar.baz = 0
-    assert betterproto.serialized_on_wire(foo.bar) == True
+    assert betterproto.serialized_on_wire(foo.bar) is True
 
     # Manual override (don't do this)
     foo.bar._serialized_on_wire = False
-    assert betterproto.serialized_on_wire(foo.bar) == False
+    assert betterproto.serialized_on_wire(foo.bar) is False
 
     # Can manually set it but defaults to false
     foo.bar = Bar()
-    assert betterproto.serialized_on_wire(foo.bar) == False
+    assert betterproto.serialized_on_wire(foo.bar) is False
 
 
 def test_class_init():
@@ -118,7 +118,7 @@ def test_oneof_support():
 
     # Group 1 shouldn't be touched, group 2 should have reset
     assert foo.sub.val == 0
-    assert betterproto.serialized_on_wire(foo.sub) == False
+    assert betterproto.serialized_on_wire(foo.sub) is False
     assert betterproto.which_one_of(foo, "group2")[0] == "abc"
 
     # Zero value should always serialize for one-of
@@ -175,8 +175,8 @@ def test_optional_flag():
     assert bytes(Request(flag=False)) == b"\n\x00"
 
     # Differentiate between not passed and the zero-value.
-    assert Request().parse(b"").flag == None
-    assert Request().parse(b"\n\x00").flag == False
+    assert Request().parse(b"").flag is None
+    assert Request().parse(b"\n\x00").flag is False
 
 
 def test_to_dict_default_values():