1
diff --git a/cloudinit/util.py b/cloudinit/util.py
2
index 338fb97..5a919cf 100644
3
--- a/cloudinit/util.py
4
+++ b/cloudinit/util.py
5
@@ -1865,8 +1865,13 @@ def subp(args, data=None, rcs=None, env=None, capture=True, shell=False,
6
1865
        if not isinstance(data, bytes):
1865
        if not isinstance(data, bytes):
7
1866
            data = data.encode()
1866
            data = data.encode()
8
1867
1867
9
1868
    # Popen converts entries in the arguments array from non-bytes to bytes.
10
1869
    # When locale is unset it may use ascii for that encoding which can
11
1870
    # cause UnicodeDecodeErrors. (LP: #1751051)
12
1871
    bytes_args = [x if isinstance(x, six.binary_type) else x.encode("utf-8")
13
1872
                  for x in args]
14
1868
    try:
1873
    try:
16
1869
        sp = subprocess.Popen(args, stdout=stdout,
1874
        sp = subprocess.Popen(bytes_args, stdout=stdout,
17
1870
                              stderr=stderr, stdin=stdin,
1875
                              stderr=stderr, stdin=stdin,
18
1871
                              env=env, shell=shell)
1876
                              env=env, shell=shell)
19
1872
        (out, err) = sp.communicate(data)
1877
        (out, err) = sp.communicate(data)
20
diff --git a/tests/unittests/test_util.py b/tests/unittests/test_util.py
21
index 4a92e74..89ae40f 100644
22
--- a/tests/unittests/test_util.py
23
+++ b/tests/unittests/test_util.py
24
@@ -8,7 +8,9 @@ import shutil
25
8
import stat
8
import stat
26
9
import tempfile
9
import tempfile
27
10
10
28
11
import json
29
11
import six
12
import six
30
13
import sys
31
12
import yaml
14
import yaml
32
13
15
33
14
from cloudinit import importer, util
16
from cloudinit import importer, util
34
@@ -733,6 +735,38 @@ class TestSubp(helpers.CiTestCase):
35
733
        self.assertEqual("/target/my/path/",
735
        self.assertEqual("/target/my/path/",
36
734
                         util.target_path("/target/", "///my/path/"))
736
                         util.target_path("/target/", "///my/path/"))
37
735
737
38
738
    def test_c_lang_can_take_utf8_args(self):
39
739
        """Independent of system LC_CTYPE, args can contain utf-8 strings.
40
740
41
741
        When python starts up, its default encoding gets set based on
42
742
        the value of LC_CTYPE.  If no system locale is set, the default
43
743
        encoding for both python2 and python3 in some paths will end up
44
744
        being ascii.
45
745
46
746
        Attempts to use setlocale or patching (or changing) os.environ
47
747
        in the current environment seem to not be effective.
48
748
49
749
        This test starts up a python with LC_CTYPE set to C so that
50
750
        the default encoding will be set to ascii.  In such an environment
51
751
        Popen(['command', 'non-ascii-arg']) would cause a UnicodeDecodeError.
52
752
        """
53
753
        python_prog = '\n'.join([
54
754
            'import json, sys',
55
755
            'from cloudinit.util import subp',
56
756
            'data = sys.stdin.read()',
57
757
            'cmd = json.loads(data)',
58
758
            'subp(cmd, capture=False)',
59
759
            ''])
60
760
        cmd = [BASH, '-c', 'echo -n "$@"', '--',
61
761
               self.utf8_valid.decode("utf-8")]
62
762
        python_subp = [sys.executable, '-c', python_prog]
63
763
64
764
        out, _err = util.subp(
65
765
            python_subp, update_env={'LC_CTYPE': 'C'},
66
766
            data=json.dumps(cmd).encode("utf-8"),
67
767
            decode=False)
68
768
        self.assertEqual(self.utf8_valid, out)
69
769
70
736
770
71
737
class TestEncode(helpers.TestCase):
771
class TestEncode(helpers.TestCase):
72
738
    """Test the encoding functions"""
772
    """Test the encoding functions"""
Reviewer	Review Type	Date Requested	Status
Server Team CI bot	continuous-integration		Approve on 2018-02-23
Ryan Harper		2018-02-22	Approve on 2018-02-23
Review via email: mp+338586@code.launchpad.net