Restore urllib.parse.parse_qs behavior on new versions of python

.pre-commit-config.yaml

@@ -5,7 +5,7 @@ repos:
     rev: stable
     hooks:
       - id: black
-        language_version: python3.7
+        language_version: python3
   -   repo: https://github.com/pre-commit/pre-commit-hooks
       rev: v2.0.0
       hooks:

azure-pipelines.yml

@@ -54,6 +54,7 @@ stages:
     - script: |
         . venv/bin/activate
 
+        pip install -r requirements_test.txt
         pip install pytest pytest-azurepipelines pytest-cov pytest-xdist
         pytest --cov compal --cov-report html -qq -o console_output_style=count -p no:sugar tests
       displayName: 'pytest'

compal/__init__.py

@@ -1,6 +1,7 @@
 """
 Client for the Compal CH7465LG/Ziggo Connect box cable modem
 """
+import inspect
 import io
 import itertools
 import logging
@@ -17,13 +18,13 @@
 from .models import (
     BandSetting,
     FilterAction,
+    GuestNetworkSettings,
+    InterfaceGuestNetworkSettings,
     NatMode,
     PortForward,
     Proto,
     RadioSettings,
     TimerMode,
-    InterfaceGuestNetworkSettings,
-    GuestNetworkSettings,
 )
 
 LOGGER = logging.getLogger(__name__)
@@ -207,7 +208,14 @@ def login(self, key=None):
             else:
                 raise ValueError("Login failed for unknown reason!")
 
-        tokens = urllib.parse.parse_qs(res.text)
+        def parse_response(text):
+            # As per python 3.9.2 parse_qs does not split on ';' by default
+            if "separator" in inspect.signature(urllib.parse.parse_qs).parameters:
+                return urllib.parse.parse_qs(text, separator=";")
+            else:
+                return urllib.parse.parse_qs(text)
+
+        tokens = parse_response(res.text)
 
         token_sids = tokens.get("SID")
         if not token_sids:

pyproject.toml

@@ -27,4 +27,4 @@ use_parentheses = true
 line_length = 88
 
 [settings]
-known_third_party = ["lxml", "requests", "setuptools"]
+known_third_party = ["lxml", "requests", "responses", "setuptools"]

requirements_test.txt

@@ -1,2 +1,3 @@
 black
 isort[pyproject]
+responses

tests/test_login_response_parsing.py

@@ -0,0 +1,28 @@
+import responses
+
+from compal import Compal
+
+
+def load_login_responses(ip):
+    # Response required by constructor
+    responses.add(
+        responses.Response(
+            method="GET",
+            url=f"http://{ip}/",
+            status=302,
+            headers={"Location": "../common_page/login.html"},
+        )
+    )
+    responses.add(responses.GET, f"http://{ip}/common_page/login.html", body="dummy")
+
+    # Successful login response
+    responses.add(
+        responses.POST, f"http://{ip}/xml/setter.xml", body="successful;SID=1025573888"
+    )
+
+
+@responses.activate
+def test_successful_response():
+    load_login_responses("router")
+    router = Compal("router", "1234")
+    router.login()