Fix port not being marked as int in several places.

- I was confused on what the interface for port was initially, but a close look at how it's tested gave me a better idea.
- Also, add a few explicit return annotations.

Author: Sachaa-Thanasius

src/rfc3986/_mixin.py

@@ -10,6 +10,8 @@
 
 
 class _AuthorityInfo(t.TypedDict):
+    """A typed dict for the authority info triple: userinfo, host, and port."""
+
     userinfo: t.Optional[str]
     host: t.Optional[str]
     port: t.Optional[str]

src/rfc3986/iri.py

@@ -50,7 +50,7 @@ def __new__(
         query: t.Optional[str],
         fragment: t.Optional[str],
         encoding: str = "utf-8",
-    ):
+    ) -> _Self:
         """Create a new IRIReference."""
         ref = super().__new__(
             cls,
@@ -65,7 +65,7 @@ def __new__(
 
     __hash__ = tuple.__hash__
 
-    def __eq__(self, other: object):
+    def __eq__(self, other: object) -> bool:
         """Compare this reference to another."""
         other_ref = other
         if isinstance(other, tuple):

src/rfc3986/parseresult.py

@@ -91,7 +91,7 @@ class ParseResult(
     scheme: t.Optional[str]
     userinfo: t.Optional[str]
     host: t.Optional[str]
-    port: t.Optional[str]
+    port: t.Optional[int]
     path: t.Optional[str]
     query: t.Optional[str]
     fragment: t.Optional[str]
@@ -103,13 +103,13 @@ def __new__(
         scheme: t.Optional[str],
         userinfo: t.Optional[str],
         host: t.Optional[str],
-        port: t.Optional[str],
+        port: t.Optional[int],
         path: t.Optional[str],
         query: t.Optional[str],
         fragment: t.Optional[str],
         uri_ref: "uri.URIReference",
         encoding: str = "utf-8",
-    ):
+    ) -> _Self:
         """Create a new ParseResult."""
         parse_result = super().__new__(
             cls,
@@ -201,7 +201,7 @@ def from_string(
         )
 
     @property
-    def authority(self):
+    def authority(self) -> t.Optional[str]:
         """Return the normalized authority."""
         return self.reference.authority
 
@@ -214,7 +214,7 @@ def copy_with(
         path: t.Optional[str] = misc.UseExisting,
         query: t.Optional[str] = misc.UseExisting,
         fragment: t.Optional[str] = misc.UseExisting,
-    ):
+    ) -> "ParseResult":
         """Create a copy of this instance replacing with specified parts."""
         attributes = zip(
             PARSED_COMPONENTS,
@@ -273,7 +273,7 @@ class ParseResultBytes(
     scheme: t.Optional[bytes]
     userinfo: t.Optional[bytes]
     host: t.Optional[bytes]
-    port: t.Optional[bytes]
+    port: t.Optional[int]
     path: t.Optional[bytes]
     query: t.Optional[bytes]
     fragment: t.Optional[bytes]
@@ -286,14 +286,14 @@ def __new__(
         scheme: t.Optional[bytes],
         userinfo: t.Optional[bytes],
         host: t.Optional[bytes],
-        port: t.Optional[bytes],
+        port: t.Optional[int],
         path: t.Optional[bytes],
         query: t.Optional[bytes],
         fragment: t.Optional[bytes],
         uri_ref: "uri.URIReference",
         encoding: str = "utf-8",
         lazy_normalize: bool = True,
-    ):
+    ) -> _Self:
         """Create a new ParseResultBytes instance."""
         parse_result = super().__new__(
             cls,
@@ -322,7 +322,7 @@ def from_parts(
         fragment: t.Optional[str] = None,
         encoding: str = "utf-8",
         lazy_normalize: bool = True,
-    ):
+    ) -> _Self:
         """Create a ParseResult instance from its parts."""
         authority = ""
         if userinfo is not None:

src/rfc3986/uri.py

@@ -90,7 +90,7 @@ def __new__(
         query: t.Optional[str],
         fragment: t.Optional[str],
         encoding: str = "utf-8",
-    ):
+    ) -> _Self:
         """Create a new URIReference."""
         ref = super().__new__(
             cls,
@@ -105,7 +105,7 @@ def __new__(
 
     __hash__ = tuple.__hash__
 
-    def __eq__(self, other: object):
+    def __eq__(self, other: object) -> bool:
         """Compare this reference to another."""
         other_ref = other
         if isinstance(other, tuple):