Make Origin use scheme, not is_ssl (#168)

This commit is contained in:
Stephen Brown II 2019-07-28 21:43:06 -05:00 committed by Seth Michael Larson
parent 72e6f47897
commit 44beaa1c8f
3 changed files with 6 additions and 6 deletions

View File

@ -110,6 +110,7 @@ True
```
* `def __init__(url)`
* `.scheme` - **str**
* `.is_ssl` - **bool**
* `.host` - **str**
* `.port` - **int**

View File

@ -26,10 +26,8 @@ class ConnectionStore:
"""
def __init__(self) -> None:
self.all = {} # type: typing.Dict[HTTPConnection, float]
self.by_origin = (
{}
) # type: typing.Dict[Origin, typing.Dict[HTTPConnection, float]]
self.all: typing.Dict[HTTPConnection, float] = {}
self.by_origin: typing.Dict[Origin, typing.Dict[HTTPConnection, float]] = {}
def pop_by_origin(
self, origin: Origin, http2_only: bool = False

View File

@ -233,6 +233,7 @@ class Origin:
def __init__(self, url: URLTypes) -> None:
if not isinstance(url, URL):
url = URL(url)
self.scheme = url.scheme
self.is_ssl = url.is_ssl
self.host = url.host
self.port = url.port
@ -240,13 +241,13 @@ class Origin:
def __eq__(self, other: typing.Any) -> bool:
return (
isinstance(other, self.__class__)
and self.is_ssl == other.is_ssl
and self.scheme == other.scheme
and self.host == other.host
and self.port == other.port
)
def __hash__(self) -> int:
return hash((self.is_ssl, self.host, self.port))
return hash((self.scheme, self.host, self.port))
class QueryParams(typing.Mapping[str, str]):