← Back to branch summary

~hopem/charm-helpers/fix-precise-haproxy-ipv6

« back to all changes in this revision

Viewing changes to charmhelpers/contrib/network/ip.py

  • Committer: Stuart Bishop
  • Date: 2014-11-25 16:06:34 UTC
  • mfrom: (158.2.46 fix-configure_sources)
  • Revision ID: stuart@stuartbishop.net-20141125160634-wo9uarwrv20ew23y
[stub, r=niedbalski,tvansteenburgh] The Return of Python 3 Support

Show diffs side-by-side

added added

removed removed

Lines of Context:
charmhelpers/contrib/network/ip.py
302
302
        if global_addrs:
303
303
            # Make sure any found global addresses are not temporary
304
304
            cmd = ['ip', 'addr', 'show', iface]
305
 
            out = subprocess.check_output(cmd)
 
305
            out = subprocess.check_output(cmd).decode('UTF-8')
306
306
            if dynamic_only:
307
307
                key = re.compile("inet6 (.+)/[0-9]+ scope global dynamic.*")
308
308
            else: