Changeset a2e54d9 in rattail

Timestamp:

10/31/2022 08:52:06 PM (3 months ago)

Author:

Lance Edgar <lance@…>

Branches:

master

Children:

5900035

Parents:

5bcc3ba

Message:

Add workaround for shlex.join() prior to python 3.8

Location:

rattail

Files:

• luigi/handler.py (modified) (4 diffs)
• util.py (modified) (2 diffs)

rattail/luigi/handler.py

@@ -29 +29 @@
 import os
 import logging
-import shlex
 import subprocess
 import sys
@@ -38 +37 @@
 
 from rattail.app import GenericHandler
+from rattail.util import shlex_join
 
 
@@ -133 +133 @@
                cmd]
 
-        cmd = ['echo', shlex.join(cmd)]
-        cmd = shlex.join(cmd)
+        cmd = ['echo', shlex_join(cmd)]
+        cmd = shlex_join(cmd)
 
         cmd = "{} | at 'now + 1 minute'".format(cmd)
@@ -221 +221 @@
                'run-n-mail',
                '-S', 'Backfill thru {}: {}'.format(last_date, task['description']),
-               shlex.join(cmd)]
-
-        cmd = ['echo', shlex.join(cmd)]
-        cmd = shlex.join(cmd)
+               shlex_join(cmd)]
+
+        cmd = ['echo', shlex_join(cmd)]
+        cmd = shlex_join(cmd)
 
         cmd = "{} | at 'now + 1 minute'".format(cmd)

rattail/util.py

@@ -28 +28 @@
 from __future__ import division
 
+import shlex
 import sys
 import datetime
@@ -365 +366 @@
         return "{}: {}".format(cls, msg)
     return cls
+
+
+def shlex_join(split_command):
+    """
+    Wrapper which invokes ``shlex.join()`` if available; otherwise
+    a workaround is implemented.
+
+    cf. https://stackoverflow.com/a/50022816
+    """
+    if hasattr(shlex, 'join'):
+        return shlex.join(split_command)
+
+    return ' '.join(shlex.quote(x) for x in split_command)