From e7d09b0912880b809dfca82ba0cc8c415fc5da30 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Sun, 16 Feb 2025 15:20:45 +0100 Subject: [PATCH 1/4] fix: clean up unused imports --- varlink/server.py | 2 +- varlink/tests/test_mocks.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/varlink/server.py b/varlink/server.py index 1495f79..353dc29 100644 --- a/varlink/server.py +++ b/varlink/server.py @@ -9,7 +9,6 @@ import socket import stat import string -import sys try: from builtins import int @@ -360,6 +359,7 @@ class Server(BaseServer): >>> import varlink >>> import os + >>> import sys >>> >>> service = varlink.Service(vendor='Example', product='Examples', version='1', url='http://example.com', >>> interface_dir=os.path.dirname(__file__)) diff --git a/varlink/tests/test_mocks.py b/varlink/tests/test_mocks.py index ad1cac4..e39cc28 100644 --- a/varlink/tests/test_mocks.py +++ b/varlink/tests/test_mocks.py @@ -1,4 +1,3 @@ -import time import unittest from varlink import mock import varlink From 693c59b6ab22cd994e001c95c74298b70426f4e0 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Sun, 16 Feb 2025 19:01:45 +0100 Subject: [PATCH 2/4] fix: typo 'stoping' in varlink/mock.py --- varlink/mock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/varlink/mock.py b/varlink/mock.py index 496be6b..4e4ffda 100644 --- a/varlink/mock.py +++ b/varlink/mock.py @@ -231,7 +231,7 @@ def wrapper(*args, **kwargs): try: func(*args, **kwargs) except BrokenPipeError: - # manage fake service stoping + # manage fake service stopping pass return return wrapper From 53c5087811e89dae5e3bcd753b2322cd9c30f615 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Sun, 16 Feb 2025 19:03:29 +0100 Subject: [PATCH 3/4] fix: test membership should be `not in` --- varlink/client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/varlink/client.py b/varlink/client.py index e490ffb..f400e1d 100644 --- a/varlink/client.py +++ b/varlink/client.py @@ -107,7 +107,7 @@ def _next_varlink_message(self): message = next(self._next_message()) message = json.loads(message) - if not 'parameters' in message: + if 'parameters' not in message: message['parameters'] = {} if 'error' in message and message["error"] != None: From fa71dd49d4539bbe2c7ac94196a96c08ac843104 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Sun, 16 Feb 2025 19:10:56 +0100 Subject: [PATCH 4/4] fix: use `is` for comparison against `None` As PEP8 states, comparisons to singletons such as `None` should always use `is` to compare. --- varlink/__init__.py | 2 +- varlink/client.py | 4 ++-- varlink/scanner.py | 16 ++++++++-------- varlink/server.py | 6 +++--- varlink/tests/test_certification.py | 4 ++-- varlink/tests/test_orgexamplemore.py | 6 +++--- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/varlink/__init__.py b/varlink/__init__.py index 42a9375..0e401a2 100644 --- a/varlink/__init__.py +++ b/varlink/__init__.py @@ -44,7 +44,7 @@ def load_tests(loader, tests, pattern): import sys from fnmatch import fnmatch - if pattern == None: + if pattern is None: pattern = "test_*.py" # top level directory cached on loader instance diff --git a/varlink/client.py b/varlink/client.py index f400e1d..80d37af 100644 --- a/varlink/client.py +++ b/varlink/client.py @@ -110,7 +110,7 @@ def _next_varlink_message(self): if 'parameters' not in message: message['parameters'] = {} - if 'error' in message and message["error"] != None: + if 'error' in message and message["error"] is not None: self._in_use = False e = VarlinkError.new(message, self._namespaced) raise e @@ -566,7 +566,7 @@ def _with_resolved_interface(self, interface, resolver_address=None): return self def cleanup(self): - if hasattr(self, "_tmpdir") and self._tmpdir != None: + if hasattr(self, "_tmpdir") and self._tmpdir is not None: try: shutil.rmtree(self._tmpdir) except FileNotFoundError: diff --git a/varlink/scanner.py b/varlink/scanner.py index 5aa9a66..9b61bc1 100644 --- a/varlink/scanner.py +++ b/varlink/scanner.py @@ -143,7 +143,7 @@ def read_struct(self): if not self.get(')'): while True: name = self.expect('identifier') - if _isenum == None: + if _isenum is None: if self.get(':'): _isenum = False fields[name] = self.read_type() @@ -314,12 +314,12 @@ def filter_params(self, parent_name, varlink_type, _namespaced, args, kwargs): # print("filter_params", type(varlink_type), repr(varlink_type), args, kwargs, type(args)) if isinstance(varlink_type, _Maybe): - if args == None: + if args is None: return None return self.filter_params(parent_name, varlink_type.element_type, _namespaced, args, kwargs) if isinstance(varlink_type, _Dict): - if args == None: + if args is None: return {} if isinstance(args, Mapping): @@ -346,7 +346,7 @@ def filter_params(self, parent_name, varlink_type, _namespaced, args, kwargs): return args if isinstance(varlink_type, _Array): - if args == None: + if args is None: return [] return [self.filter_params(parent_name + '[]', varlink_type.element_type, _namespaced, x, None) for x in @@ -398,7 +398,7 @@ def filter_params(self, parent_name, varlink_type, _namespaced, args, kwargs): args = None ret = self.filter_params(parent_name + "." + name, varlink_type.fields[name], _namespaced, val, None) - if ret != None: + if ret is not None: # print("SetOUT:", name) if _namespaced: setattr(out, name, ret) @@ -409,7 +409,7 @@ def filter_params(self, parent_name, varlink_type, _namespaced, args, kwargs): if name in kwargs: ret = self.filter_params(parent_name + "." + name, varlink_type.fields[name], _namespaced, kwargs[name], None) - if ret != None: + if ret is not None: # print("SetOUT:", name) if _namespaced: setattr(out, name, ret) @@ -425,7 +425,7 @@ def filter_params(self, parent_name, varlink_type, _namespaced, args, kwargs): val = varlink_struct[name] ret = self.filter_params(parent_name + "." + name, varlink_type.fields[name], _namespaced, val, None) - if ret != None: + if ret is not None: # print("SetOUT:", name) if _namespaced: setattr(out, name, ret) @@ -435,7 +435,7 @@ def filter_params(self, parent_name, varlink_type, _namespaced, args, kwargs): val = getattr(varlink_struct, name) ret = self.filter_params(parent_name + "." + name, varlink_type.fields[name], _namespaced, val, None) - if ret != None: + if ret is not None: # print("SetOUT:", name) if _namespaced: setattr(out, name, ret) diff --git a/varlink/server.py b/varlink/server.py index 353dc29..f4437f5 100644 --- a/varlink/server.py +++ b/varlink/server.py @@ -122,7 +122,7 @@ def _handle(self, message, raw_message, _server=None, _request=None): method = interface.get_method(method_name) parameters = message.get('parameters', {}) - if parameters == None: + if parameters is None: parameters = {} handler = self.interfaces_handlers[interface.name] @@ -240,7 +240,7 @@ def handle(self, message, _server=None, _request=None): string = message.decode('utf-8') handle = self._handle(json.loads(string), message, _server, _request) for out in handle: - if out == None: + if out is None: return try: yield json.dumps(out, cls=VarlinkEncoder).encode('utf-8') @@ -346,7 +346,7 @@ def handle(self): continue for reply in self.service.handle(message, _server=self.server, _request=self.request): - if reply != None: + if reply is not None: self.wfile.write(reply + b'\0') message = b'' diff --git a/varlink/tests/test_certification.py b/varlink/tests/test_certification.py index be3d3c7..bf00e8e 100755 --- a/varlink/tests/test_certification.py +++ b/varlink/tests/test_certification.py @@ -329,11 +329,11 @@ def Test10(self, client_id, mytype, _server=None, _raw=None, _message=None): } if "nullable" in mytype: - self.assert_cmp(client_id, _server, _raw, wants, mytype["nullable"] == None) + self.assert_cmp(client_id, _server, _raw, wants, mytype["nullable"] is None) del mytype["nullable"] if "nullable_array_struct" in mytype: - self.assert_cmp(client_id, _server, _raw, wants, mytype["nullable_array_struct"] == None) + self.assert_cmp(client_id, _server, _raw, wants, mytype["nullable_array_struct"] is None) del mytype["nullable_array_struct"] self.assert_cmp(client_id, _server, _raw, wants, mytype == wants["parameters"]["mytype"]) diff --git a/varlink/tests/test_orgexamplemore.py b/varlink/tests/test_orgexamplemore.py index a4a8661..72cc068 100755 --- a/varlink/tests/test_orgexamplemore.py +++ b/varlink/tests/test_orgexamplemore.py @@ -51,15 +51,15 @@ def run_client(client): client.open('org.example.more', namespaced=True) as con2: for m in con1.TestMore(10, _more=True): - if hasattr(m.state, 'start') and m.state.start != None: + if hasattr(m.state, 'start') and m.state.start is not None: if m.state.start: print("--- Start ---", file=sys.stderr) - if hasattr(m.state, 'end') and m.state.end != None: + if hasattr(m.state, 'end') and m.state.end is not None: if m.state.end: print("--- End ---", file=sys.stderr) - if hasattr(m.state, 'progress') and m.state.progress != None: + if hasattr(m.state, 'progress') and m.state.progress is not None: print("Progress:", m.state.progress, file=sys.stderr) if m.state.progress > 50: ret = con2.Ping("Test")