From 429706c15aae88e7a766209a8ee6f1439648bedb Mon Sep 17 00:00:00 2001 From: Chris Curvey Date: Wed, 8 Apr 2020 11:26:46 -0400 Subject: [PATCH 1/2] removed dependency on deprecated splitport() --- bmemcached/protocol.py | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/bmemcached/protocol.py b/bmemcached/protocol.py index 3ec99be..288d932 100644 --- a/bmemcached/protocol.py +++ b/bmemcached/protocol.py @@ -4,10 +4,6 @@ import socket import struct import threading -try: - from urllib import splitport # type: ignore -except ImportError: - from urllib.parse import splitport # type: ignore import zlib from io import BytesIO @@ -177,10 +173,23 @@ def split_host_port(cls, server): >>> split_host_port('127.0.0.1') ('127.0.0.1', 11211) """ - host, port = splitport(server) - if port is None: + try: + import wingdbstub + except ImportError: + pass + + parts = server.split(':') + if len(parts) == 2: + host = parts[0] + try: + port = int(parts[1]) + except (TypeError, ValueError): + port = 11211 + host = server + else: + host = parts[0] port = 11211 - port = int(port) + if re.search(':.*$', host): host = re.sub(':.*$', '', host) return host, port From 1ab5162ed33ab86639e531ee7f1a1cb0ace1e7cf Mon Sep 17 00:00:00 2001 From: Chris Curvey Date: Wed, 8 Apr 2020 11:30:35 -0400 Subject: [PATCH 2/2] removed debug code --- bmemcached/protocol.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/bmemcached/protocol.py b/bmemcached/protocol.py index 288d932..18fa7e3 100644 --- a/bmemcached/protocol.py +++ b/bmemcached/protocol.py @@ -173,11 +173,6 @@ def split_host_port(cls, server): >>> split_host_port('127.0.0.1') ('127.0.0.1', 11211) """ - try: - import wingdbstub - except ImportError: - pass - parts = server.split(':') if len(parts) == 2: host = parts[0]