Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Avoid urllib.parse.splitport DeprecationWarning #257

Merged
merged 2 commits into from
Oct 23, 2024
Merged

Avoid urllib.parse.splitport DeprecationWarning #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
801f344
Use an unofficial setup-python action that still works with 2.7
andersk Oct 23, 2024
3d44035
Avoid urllib.parse.splitport DeprecationWarning
andersk Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests-and-lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: LizardByte/setup-python-action@v2024.919.163656
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any specific reason on why this action is changing?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CI doesn’t pass on master because Python 2.7 was removed from actions/setup-python last year: actions/setup-python#672.

If it were my project, I would have removed Python 2.7 support years ago—let me know if that’s the route you would prefer.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I'll read the code on that to see what it does. The support for python 2 is there because on redhat there are still users using it

with:
python-version: ${{ matrix.python-version }}
- name: Install Dependencies
Expand Down
14 changes: 4 additions & 10 deletions bmemcached/protocol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
from datetime import datetime, timedelta
import logging
import re
import socket
import struct
import threading
try:
from urllib import splitport # type: ignore
from urlparse import SplitResult # type: ignore[import-not-found]
except ImportError:
from urllib.parse import splitport # type: ignore
from urllib.parse import SplitResult # type: ignore[import-not-found]

import zlib
from io import BytesIO
Expand Down Expand Up @@ -180,13 +179,8 @@ 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:
port = 11211
port = int(port)
if re.search(':.*$', host):
host = re.sub(':.*$', '', host)
return host, port
u = SplitResult("", server, "", "", "")
return u.hostname, 11211 if u.port is None else u.port

def _read_socket(self, size):
"""
Expand Down
5 changes: 2 additions & 3 deletions test/test_server_parsing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@ def testNoPortGiven(self):
self.assertEqual(server.port, 11211)

def testInvalidPort(self):
server = bmemcached.protocol.Protocol('{}:blah'.format(os.environ['MEMCACHED_HOST']))
self.assertEqual(server.host, os.environ['MEMCACHED_HOST'])
self.assertEqual(server.port, 11211)
with self.assertRaises(ValueError):
bmemcached.protocol.Protocol('{}:blah'.format(os.environ['MEMCACHED_HOST']))

def testNonStandardPort(self):
server = bmemcached.protocol.Protocol('{}:5000'.format(os.environ['MEMCACHED_HOST']))
Expand Down
Loading