Require Python >= 3.5.3

Python 3.5.2's typing module is utterly broken which unfortunately
results in runtime errors.

Author: lgrahl

.travis.yml

@@ -22,11 +22,11 @@ before_cache:
 language: python
 matrix:
   include:
-  - python: "3.5"
+  - python: "3.5.3"
     env:
     - EVENT_LOOP=asyncio
     - TIMEOUT=2.0
-  - python: "3.5"
+  - python: "3.5.3"
     env:
     - EVENT_LOOP=uvloop
     - TIMEOUT=2.0

CHANGELOG.rst

@@ -4,7 +4,7 @@ Changelog
 `4.0.0`_ (2018-01-24)
 ---------------------
 
-**Important:** Make sure you're using Python >= 3.5.2 before upgrading.
+**Important:** Make sure you're using Python >= 3.5.3 before upgrading.
 
 - Drop Python 3.4 support (major)
 - Deprecate the CLI options `-sc`, `--sslcert` and `-sk`, `--sslkey`. Use

examples/debug.py

@@ -3,13 +3,13 @@
 import ssl  # noqa
 import sys
 from typing import Any  # noqa
+from typing import Coroutine  # noqa
 from typing import List  # noqa
 from typing import Optional
 
 import logbook.more
 
 import saltyrtc.server
-from saltyrtc.server.typing import Coroutine  # noqa
 from saltyrtc.server.typing import ServerSecretPermanentKey  # noqa
 
 

examples/restartable.py

@@ -4,13 +4,13 @@
 import ssl  # noqa
 import sys
 from typing import Any  # noqa
+from typing import Coroutine  # noqa
 from typing import List  # noqa
 from typing import Optional
 
 import logbook.more
 
 import saltyrtc.server
-from saltyrtc.server.typing import Coroutine  # noqa
 from saltyrtc.server.typing import ServerSecretPermanentKey  # noqa
 
 

saltyrtc/server/__init__.py

@@ -1,5 +1,5 @@
 """
-This is a SaltyRTC server implementation for Python 3.5+ using
+This is a SaltyRTC server implementation for Python 3.5.3+ using
 :mod:`asyncio`.
 """
 import itertools

saltyrtc/server/bin.py

@@ -7,6 +7,7 @@
 import signal
 import stat
 from typing import Any  # noqa
+from typing import Coroutine  # noqa
 from typing import List  # noqa
 from typing import Optional  # noqa
 from typing import Sequence  # noqa
@@ -19,7 +20,6 @@
     server,
     util,
 )
-from .typing import Coroutine  # noqa
 from .typing import ServerSecretPermanentKey  # noqa
 from .typing import LogbookLevel
 

saltyrtc/server/message.py

@@ -2,6 +2,7 @@
 import binascii
 import io
 import struct
+from typing import ClassVar  # noqa
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -42,7 +43,6 @@
     MessageError,
     MessageFlowError,
 )
-from .typing import ClassVar  # noqa
 from .typing import (
     ChosenSubProtocol,
     ClientCookie,

saltyrtc/server/protocol.py

@@ -2,6 +2,8 @@
 import enum
 import os
 import struct
+# noinspection PyUnresolvedReferences
+from typing import Coroutine  # noqa
 from typing import Dict  # noqa
 from typing import (
     Any,
@@ -47,8 +49,6 @@
     OutgoingMessageMixin,
     unpack,
 )
-# noinspection PyUnresolvedReferences
-from .typing import Coroutine  # noqa
 from .typing import (
     ClientCookie,
     ClientPublicKey,

saltyrtc/server/server.py

@@ -3,11 +3,13 @@
 import ssl
 from collections import OrderedDict
 from typing import Awaitable  # noqa
+from typing import ClassVar  # noqa
 from typing import Dict  # noqa
 from typing import List  # noqa
 from typing import Set  # noqa
 from typing import (
     Any,
+    Coroutine,
     Iterable,
     Mapping,
     Optional,
@@ -67,10 +69,8 @@
     Path,
     PathClient,
 )
-from .typing import ClassVar  # noqa
 from .typing import (
     ChosenSubProtocol,
-    Coroutine,
     DisconnectedData,
     EventCallback,
     EventData,

saltyrtc/server/typing.py

@@ -1,4 +1,3 @@
-import sys
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -24,8 +23,6 @@
     from .events import Event  # noqa
 
 __all__ = (
-    'Coroutine',
-    'ClassVar',
     'NoReturn',
     'ListOrTuple',
     'PathHex',
@@ -62,20 +59,6 @@
 # Important: Do not export!
 T = TypeVar('T')  # Any type
 
-# Coroutine
-try:
-    from typing import Coroutine
-except ImportError:
-    # noinspection PyUnresolvedReferences
-    from typing_extensions import Coroutine  # Python <= 3.5.2
-
-# ClassVar
-try:
-    from typing import ClassVar
-except ImportError:
-    # noinspection PyUnresolvedReferences
-    from typing_extensions import ClassVar  # Python <= 3.5.2
-
 # NoReturn
 try:
     from typing import NoReturn
@@ -87,12 +70,7 @@
 # -------
 
 # List or Tuple
-py_version = sys.version_info[:3]
-if py_version > (3, 5, 2):
-    ListOrTuple = Union[List[T], Tuple[T]]
-else:
-    # Workaround for "Cannot subscript an existing Union" in Python 3.5.2
-    ListOrTuple = List  # type: ignore
+ListOrTuple = Union[List[T], Tuple[T]]
 
 
 # Common