Various cleanups found by ruff and codespell

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

varlink/client.py

@@ -107,10 +107,10 @@ 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:
+        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:

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

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)

varlink/server.py

@@ -9,7 +9,6 @@
 import socket
 import stat
 import string
-import sys
 
 try:
     from builtins import int
@@ -123,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]
@@ -241,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')
@@ -347,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''
@@ -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__))

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"])

varlink/tests/test_mocks.py

@@ -1,4 +1,3 @@
-import time
 import unittest
 from varlink import mock
 import varlink

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")