diff options
| author | Bert JW Regeer <bertjw@regeer.org> | 2020-05-07 00:43:34 -0700 |
|---|---|---|
| committer | Bert JW Regeer <bertjw@regeer.org> | 2020-08-15 18:55:04 -0700 |
| commit | 6b625826219694f791f81684b21a89de0c1d9e9b (patch) | |
| tree | f50e3e7644668828a3171223cdb4dde212cb4718 | |
| parent | 0c88f5485572da3da8f18a833090c7dc0972ae64 (diff) | |
| download | waitress-6b625826219694f791f81684b21a89de0c1d9e9b.tar.gz | |
Goodbye PY2
| -rw-r--r-- | src/waitress/adjustments.py | 3 | ||||
| -rw-r--r-- | tests/test_adjustments.py | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/waitress/adjustments.py b/src/waitress/adjustments.py index fb3233d..6851a7c 100644 --- a/src/waitress/adjustments.py +++ b/src/waitress/adjustments.py @@ -19,7 +19,6 @@ import warnings from .proxy_headers import PROXY_HEADERS from .compat import ( - PY2, WIN, string_types, HAS_IPV6, @@ -346,7 +345,7 @@ class Adjustments: else: (host, port) = (i, str(self.port)) - if WIN and PY2: # pragma: no cover + if WIN: # pragma: no cover try: # Try turning the port into an integer port = int(port) diff --git a/tests/test_adjustments.py b/tests/test_adjustments.py index 303c1aa..c6dadea 100644 --- a/tests/test_adjustments.py +++ b/tests/test_adjustments.py @@ -3,7 +3,6 @@ import socket import warnings from waitress.compat import ( - PY2, WIN, ) @@ -220,7 +219,7 @@ class TestAdjustments(unittest.TestCase): self.assertRaises(ValueError, self._makeOne, listen="127.0.0.1:test") def test_service_port(self): - if WIN and PY2: # pragma: no cover + if WIN: # pragma: no cover # On Windows and Python 2 this is broken, so we raise a ValueError self.assertRaises( ValueError, self._makeOne, listen="127.0.0.1:http", |