diff options
| author | Scott Moser <smoser@ubuntu.com> | 2015-02-10 20:53:20 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2015-02-10 20:53:20 -0500 |
| commit | cd632b2f153a61faa48531cb41d0288650e72c71 (patch) | |
| tree | a3a35b9ca437d999a15fdd25c0a0de88e3cafafb /cloudinit/distros/parsers/sys_conf.py | |
| parent | 78915c97c18d678db10e0fde0d9306823c5f4610 (diff) | |
| parent | f5f280cae778bd214b91664f28d9eed997fbcda5 (diff) | |
| download | vyos-cloud-init-cd632b2f153a61faa48531cb41d0288650e72c71.tar.gz vyos-cloud-init-cd632b2f153a61faa48531cb41d0288650e72c71.zip | |
python3 support.
This gives us functional python3 support. There are likely
still bugs, but instance boot on openstack is functional now.
LP: #1247132
Diffstat (limited to 'cloudinit/distros/parsers/sys_conf.py')
| -rw-r--r-- | cloudinit/distros/parsers/sys_conf.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cloudinit/distros/parsers/sys_conf.py b/cloudinit/distros/parsers/sys_conf.py index 20ca1871..d795e12f 100644 --- a/cloudinit/distros/parsers/sys_conf.py +++ b/cloudinit/distros/parsers/sys_conf.py @@ -16,7 +16,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from StringIO import StringIO +import six +from six import StringIO import pipes import re @@ -69,7 +70,7 @@ class SysConf(configobj.ConfigObj): return out_contents.getvalue() def _quote(self, value, multiline=False): - if not isinstance(value, (str, basestring)): + if not isinstance(value, six.string_types): raise ValueError('Value "%s" is not a string' % (value)) if len(value) == 0: return '' |