Fix serializer autodiscovery

README.md

@@ -16,9 +16,12 @@ Install by using:
 
 ## Development
 
-The targets are `python2.7`, `python3.6` and up.
+The targets are `python3.6` and up. `python 2.7` support was dropped in version `3.0.20211103`. For 2.7 support use:
 
-The development environment requires `python3.6` as the `crossbar.io` based test server is unable to run in `python2.7`.
+```
+# For Python 2.7 support
+pip install swampyer=2.20210513
+```
 
 Tox is used to automate the testing between the various python versions.
 

VERSIONS.txt

@@ -124,3 +124,11 @@
 * Upgrade to simplejson for latest bugfixes, falling back on json
 * Teach json serializer how to do memoryview and bytes
 * Correct typo in extra_requires
+
+2.20210513 - Thu May 13 14:46:32 UTC 2021
+* Fix serializer discovery bug (was invoking available() on name, not object)
+
+3.0.20211103 - Wed Nov  3 23:41:39 UTC 2021
+* Drop Python 2.7 support
+* Allow newer versions of libraries (don't restrict them so tightly for the sake of 2.7 support)
+

pyproject.toml

@@ -1,17 +1,17 @@
 [tool.poetry]
 name = "swampyer"
 description = "Simple WAMP library with minimal external dependencies"
-version = '2.20210512'
+version = '3.0.20211103'
 authors = ["Aki Mimoto <aki@zaber.com>"]
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry.dependencies]
-python = ">=2.7,<3.0.0 || >=3.5.0,<4.0"
-websocket-client = "^0.59.0"
-certifi = "^2020.12.5"
+python = ">=3.6.0,<4.0"
+websocket-client = ">=0.59.0"
+certifi = ">=2020.12.5"
 six = "^1.16.0"
 cbor = { version = "^1.0.0", optional = true }
 msgpack = { version = "^1.0.2", optional = true }

swampyer/serializers.py

@@ -122,12 +122,12 @@ def available_serializers():
     """
     serializers = []
 
-    for serializer in SERIALIZER_REGISTRY.keys():
-        if serializer in SERIALIZERS_BLACKLIST:
+    for serializer_name, serializer in SERIALIZER_REGISTRY.items():
+        if serializer_name in SERIALIZERS_BLACKLIST:
             continue
         try:
             serializer.available()
-            serializers.append(serializer)
+            serializers.append(serializer_name)
         except Exception:
             pass
 

tests/common.py

@@ -14,21 +14,24 @@ def get_password():
 
 def connect_service(
           url='ws://localhost:18080/ws',
-          serializer_code='json',
+          serializer_code=None,
           concurrency_max=None,
           concurrency_class=None,
           concurrency_configs=None,
           timeout=None
           ):
     password = get_password()
+    serializers = None
+    if serializer_code:
+        serializers = [ serializer_code ]
     client = swampyer.WAMPClientTicket(
                     url=url,
                     username=u"test",
                     password=six.u(password),
                     realm=u"realm1",
                     uri_base="",
                     timeout=timeout,
-                    serializers=[serializer_code],
+                    serializers=serializers,
                     auto_reconnect=False,
                     concurrency_max=concurrency_max,
                     concurrency_class=concurrency_class,

tests/test_01_imports.py

@@ -1,12 +1,14 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 def test_can_import():
 
     ex = None
     try:
         import swampyer
     except Exception as ex:
+        print("Error:", ex)
         pass
     assert ex == None
 
-
+if __name__ == '__main__':
+    test_can_import()

tests/test_02_connect.py

@@ -3,6 +3,7 @@
 from common import *
 import logging
 import sys
+import time
 
 import swampyer
 
@@ -13,7 +14,9 @@
 #logging.basicConfig(stream=sys.stdout, level=1)
 
 def test_connection():
-    connect_service()
+    cli = connect_service()
+    time.sleep(1)
+    return cli
 
 if __name__ == '__main__':
-    print(connect_service())
+    print(test_connection())

tests/test_03_websockets.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 from __future__ import print_function
 
 from common import *

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = pypy3,py27,py36,py38,py39
+envlist = pypy3,py36,py38,py39
 isolated_build = True
 
 [tox:.package]