Skip to content

Clean up python 2 leftovers #67

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
behrmann merged 2 commits into from
Jul 22, 2025
Merged

Clean up python 2 leftovers #67

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
450d7fd
varlink: drop inspect.signature fallback
jelly Jul 21, 2025
63d8883
Fix `split` does not exists on `string` error
jelly Jul 21, 2025
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
30 changes: 11 additions & 19 deletions varlink/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import os
import socket
import stat
import string
from socketserver import BaseServer, StreamRequestHandler, ThreadingMixIn

from .error import InterfaceNotFound, InvalidParameter, MethodNotImplemented, VarlinkEncoder, VarlinkError
Expand Down Expand Up @@ -138,23 +137,16 @@ def _handle(self, message, raw_message, _server=None, _request=None):

kwargs = {}

if hasattr(inspect, "signature"):
sig = inspect.signature(func)
arg_names = [
(
sig.parameters[k].kind
in (inspect.Parameter.POSITIONAL_OR_KEYWORD, inspect.Parameter.KEYWORD_ONLY)
and k
or None
)
for k in sig.parameters.keys()
]
else:
from itertools import izip

spec = inspect.getargspec(func)
matched_args = [reversed(x) for x in [spec.args, spec.defaults or []]]
arg_names = dict(izip(*matched_args))
sig = inspect.signature(func)
arg_names = [
(
sig.parameters[k].kind
in (inspect.Parameter.POSITIONAL_OR_KEYWORD, inspect.Parameter.KEYWORD_ONLY)
and k
or None
)
for k in sig.parameters.keys()
]

if message.get("more", False) or message.get("oneway", False) or message.get("upgrade", False):
if message.get("more", False) and "_more" in arg_names:
Expand Down Expand Up @@ -312,7 +304,7 @@ def get_listen_fd():
except OSError:
return None

fields = string.split(os.environ["LISTEN_FDNAMES"], ":")
fields = os.environ.get("LISTEN_FDNAMES", "").split(":")

if len(fields) != fds:
return None
Expand Down