Sourcery refactored master branch

setup.py

@@ -7,8 +7,7 @@
 # Compile the list of packages available, because distutils doesn't have
 # an easy way to do this.
 packages, data_files = [], []
-root_dir = os.path.dirname(__file__)
-if root_dir:
+if root_dir := os.path.dirname(__file__):
     os.chdir(root_dir)
 
 for dirpath, dirnames, filenames in os.walk('systemd_dbus'):
@@ -22,10 +21,7 @@
         packages.append(pkg)
     elif filenames:
         prefix = dirpath[13:] # Strip "systemd/" or "systemd\"
-        for f in filenames:
-            data_files.append(os.path.join(prefix, f))
-
-
+        data_files.extend(os.path.join(prefix, f) for f in filenames)
 setup(name='python-systemd-dbus',
       version=get_version().replace(' ', '-'),
       description='Systemd interfaces wrapper',

systemd_dbus/__init__.py

@@ -1,5 +1,4 @@
 VERSION = (0, 1)
 
 def get_version():
-    version = '%s.%s' % (VERSION[0], VERSION[1])
-    return version
+    return f'{VERSION[0]}.{VERSION[1]}'

systemd_dbus/exceptions.py

@@ -23,7 +23,7 @@ def __init__(self, error):
         self.message = error.get_dbus_message()
 
     def __str__(self):
-        return '%s(%s)' % (self.name, self.message)
+        return f'{self.name}({self.message})'
 
     def __repr__(self):
-        return '%s(%s)' % (self.name, self.message)
+        return f'{self.name}({self.message})'

systemd_dbus/manager.py

@@ -98,8 +98,7 @@ def get_job(self, ID):
         """
         try:
             job_path = self.__interface.GetJob(ID)
-            job = Job(job_path)
-            return job
+            return Job(job_path)
         except dbus.exceptions.DBusException as error:
             raise SystemdError(error)
 
@@ -114,8 +113,7 @@ def get_unit(self, name):
         """
         try:
             unit_path = self.__interface.GetUnit(name)
-            unit = Unit(unit_path)
-            return unit
+            return Unit(unit_path)
         except dbus.exceptions.DBusException as error:
             raise SystemdError(error)
 
@@ -130,8 +128,7 @@ def get_unit_by_pid(self, pid):
         """
         try:
             unit_path = self.__interface.GetUnitByPID(pid)
-            unit = Unit(unit_path)
-            return unit
+            return Unit(unit_path)
         except dbus.exceptions.DBusException as error:
             raise SystemdError(error)
 
@@ -175,9 +172,7 @@ def list_jobs(self):
         @rtype: A tuple of L{systemd_dbus.unit.Job}
         """
         try:
-            jobs = []
-            for job in self.__interface.ListJobs():
-                jobs.append(Job(job[4]))
+            jobs = [Job(job[4]) for job in self.__interface.ListJobs()]
             return tuple(jobs)
         except dbus.exceptions.DBusException as error:
             raise SystemdError(error)
@@ -191,9 +186,7 @@ def list_units(self):
         @rtype: A tuple of L{systemd_dbus.unit.Unit}
         """
         try:
-            units = []
-            for unit in self.__interface.ListUnits():
-                units.append(Unit(unit[6]))
+            units = [Unit(unit[6]) for unit in self.__interface.ListUnits()]
             return tuple(units)
         except dbus.exceptions.DBusException as error:
             raise SystemdError(error)
@@ -209,8 +202,7 @@ def load_unit(self, name):
         """
         try:
             unit_path = self.__interface.LoadUnit(name)
-            unit = Unit(unit_path)
-            return unit
+            return Unit(unit_path)
         except dbus.exceptions.DBusException as error:
             raise SystemdError(error)
 
@@ -250,8 +242,7 @@ def reload_or_restart_unit(self, name, mode):
         """
         try:
             job_path = self.__interface.ReloadOrRestartUnit(name, mode)
-            job = Job(job_path)
-            return job
+            return Job(job_path)
         except dbus.exceptions.DBusException as error:
             raise SystemdError(error)
 
@@ -267,8 +258,7 @@ def reload_or_try_restart_unit(self, name, mode):
         """
         try:
             job_path = self.__interface.ReloadOrTryRestartUnit(name, mode)
-            job = Job(job_path)
-            return job
+            return Job(job_path)
         except dbus.exceptions.DBusException as error:
             raise SystemdError(error)
 
@@ -285,8 +275,7 @@ def reload_unit(self, name, mode):
         """
         try:
             job_path = self.__interface.ReloadUnit(name, mode)
-            job = Job(job_path)
-            return job
+            return Job(job_path)
         except dbus.exceptions.DBusException as error:
             raise SystemdError(error)
 
@@ -314,8 +303,7 @@ def restart_unit(self, name, mode):
         """
         try:
             job_path = self.__interface.RestartUnit(name, mode)
-            job = Job(job_path)
-            return job
+            return Job(job_path)
         except dbus.exceptions.DBusException as error:
             raise SystemdError(error)
 
@@ -337,8 +325,7 @@ def start_unit(self, name, mode):
         """
         try:
             job_path = self.__interface.StartUnit(name, mode)
-            job = Job(job_path)
-            return job
+            return Job(job_path)
         except dbus.exceptions.DBusException as error:
             raise SystemdError(error)
 
@@ -355,8 +342,7 @@ def start_unit_replace(self, old_unit, new_unit, mode):
         """
         try:
             job_path = self.__interface.StartUnitReplace(old_unit, new_unit, mode)
-            job = Job(job_path)
-            return job
+            return Job(job_path)
         except dbus.exceptions.DBusException as error:
             raise SystemdError(error)
 
@@ -372,8 +358,7 @@ def stop_unit(self, name, mode):
         """
         try:
             job_path = self.__interface.StopUnit(name, mode)
-            job = Job(job_path)
-            return job
+            return Job(job_path)
         except dbus.exceptions.DBusException as error:
             raise SystemdError(error)
 
@@ -397,8 +382,7 @@ def try_restart_unit(self, name, mode):
         """
         try:
             job_path = self.__interface.TryRestartUnit(name, mode)
-            job = Job(job_path)
-            return job
+            return Job(job_path)
         except dbus.exceptions.DBusException as error:
             raise SystemdError(error)
 

systemd_dbus/unit.py

@@ -89,8 +89,7 @@ def reload(self, mode):
         """
         try:
             job_path = self.__interface.Reload(mode)
-            job = Job(job_path)
-            return job
+            return Job(job_path)
         except dbus.exceptions.DBusException as error:
             raise SystemdError(error)
 
@@ -107,8 +106,7 @@ def reload_or_restart(self, mode):
         """
         try:
             job_path = self.__interface.ReloadOrRestart(mode)
-            job = Job(job_path)
-            return job
+            return Job(job_path)
         except dbus.exceptions.DBusException as error:
             raise SystemdError(error)
 
@@ -123,8 +121,7 @@ def reload_or_try_restart(self, mode):
         """
         try:
             job_path = self.__interface.ReloadOrTryRestart(mode)
-            job = Job(job_path)
-            return job
+            return Job(job_path)
         except dbus.exceptions.DBusException as error:
             raise SystemdError(error)
 
@@ -145,8 +142,7 @@ def restart(self, mode):
         """
         try:
             job_path = self.__interface.Restart(mode)
-            job = Job(job_path)
-            return job
+            return Job(job_path)
         except dbus.exceptions.DBusException as error:
             raise SystemdError(error)
 
@@ -161,8 +157,7 @@ def start(self, mode):
         """
         try:
             job_path = self.__interface.Start(mode)
-            job = Job(job_path)
-            return job
+            return Job(job_path)
         except dbus.exceptions.DBusException as error:
             raise SystemdError(error)
 
@@ -177,8 +172,7 @@ def stop(self, mode):
         """
         try:
             job_path = self.__interface.Stop(mode)
-            job = Job(job_path)
-            return job
+            return Job(job_path)
         except dbus.exceptions.DBusException as error:
             raise SystemdError(error)
 
@@ -193,7 +187,6 @@ def try_restart(self,mode):
         """
         try:
             job_path = self.__interface.TryRestart(mode)
-            job = Job(job_path)
-            return job
+            return Job(job_path)
         except dbus.exceptions.DBusException as error:
             raise SystemdError(error)