Use text=True as default for debexpo_exec

debexpo/base/views.py

@@ -63,8 +63,7 @@ def get_debexpo_version():
     # currently are in a git reposirtory. Hence, this is tested manually.
     try:
         output = debexpo_exec(command, args,
-                              cwd=dirname(abspath(__file__)),
-                              text=True)
+                              cwd=dirname(abspath(__file__)))
     except FileNotFoundError:  # pragma: no cover
         log.debug('git not found, skip revision detection.')
     except CalledProcessError:  # pragma: no cover

debexpo/plugins/diffclean.py

@@ -43,8 +43,7 @@ class PluginDiffClean(BasePlugin):
     def _run_diffstat(self, diff_file):
         try:
             output = debexpo_exec("diffstat", ["-p1", diff_file],
-                                  cwd=dirname(diff_file),
-                                  text=True)
+                                  cwd=dirname(diff_file))
         except FileNotFoundError:  # pragma: no cover
             self.failed('diffstat not found')
         # Looking at diffstat code, it only exit with a return code different

debexpo/plugins/lintian.py

@@ -68,8 +68,7 @@ class PluginLintian(BasePlugin):
                                    # run as root in CI.
                                    "--allow-root",
                                    str(changes)],
-                                  cwd=dirname(changes.filename),
-                                  text=True)
+                                  cwd=dirname(changes.filename))
         except FileNotFoundError:  # pragma: no cover
             self.failed('lintian not found')
         except TimeoutExpired:

debexpo/plugins/watch-file.py

@@ -48,8 +48,7 @@ class PluginWatchFile(BasePlugin):
     def _run_uscan(self, source):
         try:
             output = debexpo_exec("uscan", ["--dehs", '--report'],
-                                  cwd=source.get_source_dir(),
-                                  text=True)
+                                  cwd=source.get_source_dir())
         except FileNotFoundError:  # pragma: no cover
             self.failed('uscan not found')
         except CalledProcessError as e:

debexpo/tools/debian/source.py

@@ -57,8 +57,7 @@ class Source():
         try:
             debexpo_exec('dpkg-source', args,
                          stderr=STDOUT,
-                         cwd=dirname(self.dsc.filename),
-                         text=True)
+                         cwd=dirname(self.dsc.filename))
         except FileNotFoundError:  # pragma: no cover
             log.error('dpkg-source not found')
             raise ExceptionSource('Internal error. Please contact debexpo '

debexpo/tools/gnupg.py

@@ -225,7 +225,7 @@ class GnuPG():
         try:
             output = debexpo_exec(self.gpg_path, cmd, env=env,
                                   stderr=subprocess.STDOUT,
-                                  input=str(stdin), text=True)
+                                  input=str(stdin))
         except subprocess.CalledProcessError as e:
             return (e.output, e.returncode)
         except subprocess.TimeoutExpired:

debexpo/tools/proc.py

@@ -38,4 +38,7 @@ def debexpo_exec(command, args, **kwargs):
                       f'{basename(command).replace("-", "_").upper()}',
                       getattr(settings, 'SUBPROCESS_TIMEOUT', None))
 
-    return check_output([command] + args, timeout=timeout, **kwargs)
+    return check_output([command] + args,
+                        timeout=timeout,
+                        text=True,
+                        **kwargs)