Merge lp:~harlowja/cloud-init/py2-3 into lp:~cloud-init-dev/cloud-init/trunk

[Joshua Harlow]

Gets the basic integration of six usage going.

This change does the following:

- Moves to using the new locations of modules (using six as needed)
  - urlparse moved, configparser moved, stringio...
- Fixes the octal usage that we had previously (0o644 is the new way that works)
- The utils load_file() now decodes the files by default from binary -> utf-8 (unless decode=False, decode=False seems needed for the configobj module to correctly work)
- The utils write_file() now decodes to binary before writing (from unicode) as needed
- Adjust tests to work correctly using the new way of load/writing files

[lp:~harlowja/cloud-init/py2-3]

986. By Joshua Harlow on 2014-07-08

Fix urllib.quote moving to a new location

987. By Joshua Harlow on 2014-07-08

Consistently return the unicode/text version of responses

988. By Joshua Harlow on 2014-07-08

Explicitly use response.contents instead of str(contents)

To avoid using a function that has different meaning in
python 2 and python 3 instead prefer the explict access
of the contents attribute instead (which will now always
be unicode) to avoid the subtle issues that will happen
if we continue to use str() instead.

989. By Joshua Harlow on 2014-07-08

Fix the configparser being required to use stringio and not bytesio

990. By Joshua Harlow on 2014-07-08

Fix types that changed/moved

991. By Joshua Harlow on 2014-07-08

Remove another comparison for (str, basestring)

992. By Joshua Harlow on 2014-07-08

Fix all iteritems() usage and remove (str, basestring) usage

[Bohuslav "Slavek" Kabrda (bkabrda)]

I'm also interested in cloud-init being compatible with Python 3. I don't understand cloud-init codebase that much, but the patch looks fine. My question is, what minimal Python version are you targeting? I'm assuming 2.6 and higher? If so, I'd recommend using dict.{items,keys,values} instead of six.iter{items,keys,values}(dict) - it's more readable (but really just a nitpick).

[Joshua Harlow (harlowja)]

2.6 and higher, as for the dict stuff, meh.

[Zane Bitter (zaneb)]

Looks good to me.

Minor point: "import pickle" in http://bazaar.launchpad.net/~harlowja/cloud-init/py2-3/revision/983/cloudinit/stages.py could be "from six.moves import cPickle as pickle" to avoid slowing down the existing Python 2 code.

[Barry Warsaw (barry)]

Is this branch behind trunk? I had some merge conflicts which aren't showing up in this MP.

I'm working on a new branch, highly inspired by this one, which should be more current against trunk, and use tox to ensure py2/3 compatibility. Most of the code changes here I agree with (except the iteritems ones -- I'm with Bohuslav on that :).

We have to disable the cheetah test in py3 since that package is not compatible. The biggest problem will be with the use of mocker which isn't py3 compatible. Not sure how to deal with that yet.

[Joshua Harlow (harlowja)]

Likely is behind (seeing that its not updated in a while); if you are working on a newer branch (derived from this one) that's cool and probably means we don't need this one at that point. Maybe time to slowly (or fastly) move to mock then...

[Barry Warsaw (barry)]

Here's my WIP branch: lp:~barry/cloud-init/py2-3

This largely merges Joshua's branch here, albeit manually because of aforementioned problems. It adds tox support for bilingual test runs, and the Python 2.7 test suite passes fully for me (try `tox -e py27`).

My next steps will be to look at replacing mocker and then repairing the Python 3 test suite. I'll also need to scrounge up a Python 2.6 to make sure support for that version hasn't broken.

I'll create a MP for my branch and welcome all comments and contributions!

[Scott Moser (smoser)]

dont know what the right way to do this is, but this is effectively merged. so no need for this review, so i rejected it.

Unmerged revisions

992. By Joshua Harlow on 2014-07-08

Fix all iteritems() usage and remove (str, basestring) usage

991. By Joshua Harlow on 2014-07-08

Remove another comparison for (str, basestring)

990. By Joshua Harlow on 2014-07-08

Fix types that changed/moved

989. By Joshua Harlow on 2014-07-08

Fix the configparser being required to use stringio and not bytesio

988. By Joshua Harlow on 2014-07-08

Explicitly use response.contents instead of str(contents)

To avoid using a function that has different meaning in
python 2 and python 3 instead prefer the explict access
of the contents attribute instead (which will now always
be unicode) to avoid the subtle issues that will happen
if we continue to use str() instead.

987. By Joshua Harlow on 2014-07-08

Consistently return the unicode/text version of responses

986. By Joshua Harlow on 2014-07-08

Fix urllib.quote moving to a new location

985. By Joshua Harlow on 2014-07-01

Fix up the unittests due to new changes

984. By Joshua Harlow on 2014-07-01

Adjust a bunch of moved StringIO imports

983. By Joshua Harlow on 2014-07-01

Fix a bunch more octal changes and import moves

=== modified file 'cloudinit/config/cc_apt_configure.py'
--- cloudinit/config/cc_apt_configure.py	2014-02-12 19:56:55 +0000
+++ cloudinit/config/cc_apt_configure.py	2014-07-08 04:39:36 +0000
@@ -22,6 +22,8 @@
 import os
 import re
 
+import six
+
 from cloudinit import templater
 from cloudinit import util
 
@@ -126,7 +128,7 @@
 
 
 def rename_apt_lists(old_mirrors, new_mirrors, lists_d="/var/lib/apt/lists"):
-    for (name, omirror) in old_mirrors.iteritems():
+    for (name, omirror) in six.iteritems(old_mirrors):
         nmirror = new_mirrors.get(name)
         if not nmirror:
             continue
 
=== modified file 'cloudinit/config/cc_debug.py'
--- cloudinit/config/cc_debug.py	2014-01-23 19:28:59 +0000
+++ cloudinit/config/cc_debug.py	2014-07-08 04:39:36 +0000
@@ -14,10 +14,12 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import copy
+
+from six import StringIO
+
 from cloudinit import type_utils
 from cloudinit import util
-import copy
-from StringIO import StringIO
 
 
 def _make_header(text):
 
=== modified file 'cloudinit/config/cc_landscape.py'
--- cloudinit/config/cc_landscape.py	2014-01-27 22:34:35 +0000
+++ cloudinit/config/cc_landscape.py	2014-07-08 04:39:36 +0000
@@ -20,7 +20,7 @@
 
 import os
 
-from StringIO import StringIO
+from six import StringIO
 
 from configobj import ConfigObj
 
 
=== modified file 'cloudinit/config/cc_mcollective.py'
--- cloudinit/config/cc_mcollective.py	2014-01-27 22:34:35 +0000
+++ cloudinit/config/cc_mcollective.py	2014-07-08 04:39:36 +0000
@@ -19,7 +19,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
 
 # Used since this can maintain comments
 # and doesn't need a top level section
@@ -51,7 +52,7 @@
         # original file in order to be able to mix the rest up
         mcollective_config = ConfigObj(SERVER_CFG)
         # See: http://tiny.cc/jh9agw
-        for (cfg_name, cfg) in mcollective_cfg['conf'].iteritems():
+        for (cfg_name, cfg) in six.iteritems(mcollective_cfg['conf']):
             if cfg_name == 'public-cert':
                 util.write_file(PUBCERT_FILE, cfg, mode=0644)
                 mcollective_config['plugin.ssl_server_public'] = PUBCERT_FILE
@@ -61,7 +62,7 @@
                 mcollective_config['plugin.ssl_server_private'] = PRICERT_FILE
                 mcollective_config['securityprovider'] = 'ssl'
             else:
-                if isinstance(cfg, (basestring, str)):
+                if isinstance(cfg, six.string_types):
                     # Just set it in the 'main' section
                     mcollective_config[cfg_name] = cfg
                 elif isinstance(cfg, (dict)):
@@ -69,7 +70,7 @@
                     # if it is needed and then add/or create items as needed
                     if cfg_name not in mcollective_config.sections:
                         mcollective_config[cfg_name] = {}
-                    for (o, v) in cfg.iteritems():
+                    for (o, v) in six.iteritems(cfg):
                         mcollective_config[cfg_name][o] = v
                 else:
                     # Otherwise just try to convert it to a string
@@ -81,7 +82,7 @@
         contents = StringIO()
         mcollective_config.write(contents)
         contents = contents.getvalue()
-        util.write_file(SERVER_CFG, contents, mode=0644)
+        util.write_file(SERVER_CFG, contents, mode=0o644)
 
     # Start mcollective
     util.subp(['service', 'mcollective', 'start'], capture=False)
 
=== modified file 'cloudinit/config/cc_phone_home.py'
--- cloudinit/config/cc_phone_home.py	2014-02-05 15:36:47 +0000
+++ cloudinit/config/cc_phone_home.py	2014-07-08 04:39:36 +0000
@@ -18,6 +18,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/>.
 
+import six
+
 from cloudinit import templater
 from cloudinit import util
 
@@ -81,7 +83,7 @@
         'pub_key_ecdsa': '/etc/ssh/ssh_host_ecdsa_key.pub',
     }
 
-    for (n, path) in pubkeys.iteritems():
+    for (n, path) in six.iteritems(pubkeys):
         try:
             all_keys[n] = util.load_file(path)
         except:
@@ -99,7 +101,7 @@
 
     # Get them read to be posted
     real_submit_keys = {}
-    for (k, v) in submit_keys.iteritems():
+    for (k, v) in six.iteritems(submit_keys):
         if v is None:
             real_submit_keys[k] = 'N/A'
         else:
 
=== modified file 'cloudinit/config/cc_puppet.py'
--- cloudinit/config/cc_puppet.py	2014-02-05 15:36:47 +0000
+++ cloudinit/config/cc_puppet.py	2014-07-08 04:39:36 +0000
@@ -18,7 +18,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 os
 import socket
@@ -81,7 +82,7 @@
         cleaned_contents = '\n'.join(cleaned_lines)
         puppet_config.readfp(StringIO(cleaned_contents),
                              filename=PUPPET_CONF_PATH)
-        for (cfg_name, cfg) in puppet_cfg['conf'].iteritems():
+        for (cfg_name, cfg) in six.iteritems(puppet_cfg['conf']):
             # Cert configuration is a special case
             # Dump the puppet master ca certificate in the correct place
             if cfg_name == 'ca_cert':
@@ -96,7 +97,7 @@
             else:
                 # Iterate throug the config items, we'll use ConfigParser.set
                 # to overwrite or create new items as needed
-                for (o, v) in cfg.iteritems():
+                for (o, v) in six.iteritems(cfg):
                     if o == 'certname':
                         # Expand %f as the fqdn
                         # TODO(harlowja) should this use the cloud fqdn??
 
=== modified file 'cloudinit/config/cc_resolv_conf.py'
--- cloudinit/config/cc_resolv_conf.py	2014-02-05 15:36:47 +0000
+++ cloudinit/config/cc_resolv_conf.py	2014-07-08 04:39:36 +0000
@@ -48,6 +48,7 @@
 #        timeout: 1
 #
 
+import six
 
 from cloudinit.settings import PER_INSTANCE
 from cloudinit import templater
@@ -67,8 +68,8 @@
     flags = []
     false_flags = []
     if 'options' in params:
-        for key, val in params['options'].iteritems():
-            if type(val) == bool:
+        for key, val in six.iteritems(params['options']):
+            if isinstance(val, bool):
                 if val:
                     flags.append(key)
                 else:
 
=== modified file 'cloudinit/config/cc_seed_random.py'
--- cloudinit/config/cc_seed_random.py	2014-03-04 19:35:09 +0000
+++ cloudinit/config/cc_seed_random.py	2014-07-08 04:39:36 +0000
@@ -21,7 +21,8 @@
 
 import base64
 import os
-from StringIO import StringIO
+
+from six import StringIO
 
 from cloudinit.settings import PER_INSTANCE
 from cloudinit import log as logging
 
=== modified file 'cloudinit/config/cc_ssh.py'
--- cloudinit/config/cc_ssh.py	2014-01-28 14:48:47 +0000
+++ cloudinit/config/cc_ssh.py	2014-07-08 04:39:36 +0000
@@ -21,6 +21,8 @@
 import glob
 import os
 
+import six
+
 # Ensure this is aliased to a name not 'distros'
 # since the module attribute 'distros'
 # is a list of distros that are supported, not a sub-module
@@ -68,13 +70,13 @@
 
     if "ssh_keys" in cfg:
         # if there are keys in cloud-config, use them
-        for (key, val) in cfg["ssh_keys"].iteritems():
+        for (key, val) in six.iteritems(cfg["ssh_keys"]):
             if key in KEY_2_FILE:
                 tgt_fn = KEY_2_FILE[key][0]
                 tgt_perms = KEY_2_FILE[key][1]
                 util.write_file(tgt_fn, val, tgt_perms)
 
-        for (priv, pub) in PRIV_2_PUB.iteritems():
+        for (priv, pub) in six.iteritems(PRIV_2_PUB):
             if pub in cfg['ssh_keys'] or not priv in cfg['ssh_keys']:
                 continue
             pair = (KEY_2_FILE[priv][0], KEY_2_FILE[pub][0])
 
=== modified file 'cloudinit/config/cc_yum_add_repo.py'
--- cloudinit/config/cc_yum_add_repo.py	2014-02-06 15:59:04 +0000
+++ cloudinit/config/cc_yum_add_repo.py	2014-07-08 04:39:36 +0000
@@ -18,10 +18,11 @@
 
 import os
 
+import configobj
+import six
+
 from cloudinit import util
 
-import configobj
-
 
 def _canonicalize_id(repo_id):
     repo_id = repo_id.lower().replace("-", "_")
@@ -37,7 +38,7 @@
         # Can handle 'lists' in certain cases
         # See: http://bit.ly/Qqrf1t
         return "\n    ".join([_format_repo_value(v) for v in val])
-    if not isinstance(val, (basestring, str)):
+    if not isinstance(val, six.string_types):
         return str(val)
     return val
 
 
=== modified file 'cloudinit/distros/__init__.py'
--- cloudinit/distros/__init__.py	2014-02-12 19:56:55 +0000
+++ cloudinit/distros/__init__.py	2014-07-08 04:39:36 +0000
@@ -21,7 +21,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 abc
 import itertools
@@ -268,7 +269,7 @@
             if header:
                 contents.write("%s\n" % (header))
             contents.write("%s\n" % (eh))
-            util.write_file(self.hosts_fn, contents.getvalue(), mode=0644)
+            util.write_file(self.hosts_fn, contents.getvalue(), mode=0o644)
 
     def _bring_up_interface(self, device_name):
         cmd = ['ifup', device_name]
@@ -330,7 +331,7 @@
         redact_opts = ['passwd']
 
         # Check the values and create the command
-        for key, val in kwargs.iteritems():
+        for key, val in six.iteritems(kwargs):
 
             if key in adduser_opts and val and isinstance(val, str):
                 adduser_cmd.extend([adduser_opts[key], val])
@@ -452,7 +453,7 @@
                              util.make_header(base="added"),
                              "#includedir %s" % (path), '']
                     sudoers_contents = "\n".join(lines)
-                    util.write_file(sudo_base, sudoers_contents, 0440)
+                    util.write_file(sudo_base, sudoers_contents, 0o440)
                 else:
                     lines = ['', util.make_header(base="added"),
                              "#includedir %s" % (path), '']
@@ -462,7 +463,7 @@
             except IOError as e:
                 util.logexc(LOG, "Failed to write %s", sudo_base)
                 raise e
-        util.ensure_dir(path, 0750)
+        util.ensure_dir(path, 0o750)
 
     def write_sudo_rules(self, user, rules, sudo_file=None):
         if not sudo_file:
@@ -475,7 +476,7 @@
         if isinstance(rules, (list, tuple)):
             for rule in rules:
                 lines.append("%s %s" % (user, rule))
-        elif isinstance(rules, (basestring, str)):
+        elif isinstance(rules, six.string_types):
             lines.append("%s %s" % (user, rules))
         else:
             msg = "Can not create sudoers rule addition with type %r"
@@ -490,7 +491,7 @@
                 content,
             ]
             try:
-                util.write_file(sudo_file, "\n".join(contents), 0440)
+                util.write_file(sudo_file, "\n".join(contents), 0o440)
             except IOError as e:
                 util.logexc(LOG, "Failed to write sudoers file %s", sudo_file)
                 raise e
@@ -545,10 +546,10 @@
         subst['ec2_region'] = "%s" % availability_zone[0:-1]
 
     results = {}
-    for (name, mirror) in mirror_info.get('failsafe', {}).iteritems():
+    for (name, mirror) in six.iteritems(mirror_info.get('failsafe', {})):
         results[name] = mirror
 
-    for (name, searchlist) in mirror_info.get('search', {}).iteritems():
+    for (name, searchlist) in six.iteritems(mirror_info.get('search', {})):
         mirrors = []
         for tmpl in searchlist:
             try:
@@ -588,7 +589,7 @@
 # is the standard form used in the rest
 # of cloud-init
 def _normalize_groups(grp_cfg):
-    if isinstance(grp_cfg, (str, basestring)):
+    if isinstance(grp_cfg, six.string_types):
         grp_cfg = grp_cfg.strip().split(",")
     if isinstance(grp_cfg, (list)):
         c_grp_cfg = {}
@@ -598,7 +599,7 @@
                     if k not in c_grp_cfg:
                         if isinstance(v, (list)):
                             c_grp_cfg[k] = list(v)
-                        elif isinstance(v, (basestring, str)):
+                        elif isinstance(v, six.string_types):
                             c_grp_cfg[k] = [v]
                         else:
                             raise TypeError("Bad group member type %s" %
@@ -606,12 +607,12 @@
                     else:
                         if isinstance(v, (list)):
                             c_grp_cfg[k].extend(v)
-                        elif isinstance(v, (basestring, str)):
+                        elif isinstance(v, six.string_types):
                             c_grp_cfg[k].append(v)
                         else:
                             raise TypeError("Bad group member type %s" %
                                             type_utils.obj_name(v))
-            elif isinstance(i, (str, basestring)):
+            elif isinstance(i, six.string_types):
                 if i not in c_grp_cfg:
                     c_grp_cfg[i] = []
             else:
@@ -648,7 +649,7 @@
     if isinstance(u_cfg, (dict)):
         ad_ucfg = []
         for (k, v) in u_cfg.items():
-            if isinstance(v, (bool, int, basestring, str, float)):
+            if isinstance(v, (bool, int, float) + six.string_types):
                 if util.is_true(v):
                     ad_ucfg.append(str(k))
             elif isinstance(v, (dict)):
@@ -658,12 +659,12 @@
                 raise TypeError(("Unmappable user value type %s"
                                  " for key %s") % (type_utils.obj_name(v), k))
         u_cfg = ad_ucfg
-    elif isinstance(u_cfg, (str, basestring)):
+    elif isinstance(u_cfg, six.string_types):
         u_cfg = util.uniq_merge_sorted(u_cfg)
 
     users = {}
     for user_config in u_cfg:
-        if isinstance(user_config, (str, basestring, list)):
+        if isinstance(user_config, (list,) + six.string_types):
             for u in util.uniq_merge(user_config):
                 if u and u not in users:
                     users[u] = {}
@@ -768,7 +769,7 @@
         old_user = cfg['user']
         # Translate it into the format that is more useful
         # going forward
-        if isinstance(old_user, (basestring, str)):
+        if isinstance(old_user, six.string_types):
             old_user = {
                 'name': old_user,
             }
@@ -797,7 +798,7 @@
     default_user_config = util.mergemanydict([old_user, distro_user_config])
 
     base_users = cfg.get('users', [])
-    if not isinstance(base_users, (list, dict, str, basestring)):
+    if not isinstance(base_users, (list, dict) + six.string_types):
         LOG.warn(("Format for 'users' key must be a comma separated string"
                   " or a dictionary or a list and not %s"),
                  type_utils.obj_name(base_users))
@@ -811,7 +812,7 @@
             base_users.append({'name': 'default'})
         elif isinstance(base_users, (dict)):
             base_users['default'] = dict(base_users).get('default', True)
-        elif isinstance(base_users, (str, basestring)):
+        elif isinstance(base_users, six.string_types):
             # Just append it on to be re-parsed later
             base_users += ",default"
 
 
=== modified file 'cloudinit/distros/arch.py'
--- cloudinit/distros/arch.py	2014-02-12 19:56:55 +0000
+++ cloudinit/distros/arch.py	2014-07-08 04:39:36 +0000
@@ -16,6 +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/>.
 
+import six
+
 from cloudinit import distros
 from cloudinit import helpers
 from cloudinit import log as logging
@@ -68,7 +70,7 @@
                   settings, entries)
         dev_names = entries.keys()
         # Format for netctl
-        for (dev, info) in entries.iteritems():
+        for (dev, info) in six.iteritems(entries):
             nameservers = []
             net_fn = self.network_conf_dir + dev
             net_cfg = {
 
=== modified file 'cloudinit/distros/freebsd.py'
--- cloudinit/distros/freebsd.py	2014-02-28 21:40:08 +0000
+++ cloudinit/distros/freebsd.py	2014-07-08 04:39:36 +0000
@@ -16,10 +16,11 @@
 #    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 re
 
+import six
+from six import StringIO
+
 from cloudinit import distros
 from cloudinit import helpers
 from cloudinit import log as logging
@@ -150,8 +151,9 @@
 
         redact_opts = ['passwd']
 
-        for key, val in kwargs.iteritems():
-            if key in adduser_opts and val and isinstance(val, basestring):
+        for key, val in six.iteritems(kwargs):
+            if key in adduser_opts and val \
+               and isinstance(val, six.string_types):
                 adduser_cmd.extend([adduser_opts[key], val])
 
                 # Redact certain fields from the logs
 
=== modified file 'cloudinit/distros/net_util.py'
--- cloudinit/distros/net_util.py	2014-01-24 21:20:54 +0000
+++ cloudinit/distros/net_util.py	2014-07-08 04:39:36 +0000
@@ -79,6 +79,9 @@
 #     }
 # }
 
+import six
+
+
 def translate_network(settings):
     # Get the standard cmd, args from the ubuntu format
     entries = []
@@ -103,7 +106,7 @@
             consume[cmd] = args
     # Check if anything left over to consume
     absorb = False
-    for (cmd, args) in consume.iteritems():
+    for (cmd, args) in six.iteritems(consume):
         if cmd == 'iface':
             absorb = True
     if absorb:
 
=== modified file 'cloudinit/distros/parsers/hostname.py'
--- cloudinit/distros/parsers/hostname.py	2012-11-12 22:30:08 +0000
+++ cloudinit/distros/parsers/hostname.py	2014-07-08 04:39:36 +0000
@@ -16,7 +16,7 @@
 #    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
+from six import StringIO
 
 from cloudinit.distros.parsers import chop_comment
 
 
=== modified file 'cloudinit/distros/parsers/hosts.py'
--- cloudinit/distros/parsers/hosts.py	2012-11-13 06:14:31 +0000
+++ cloudinit/distros/parsers/hosts.py	2014-07-08 04:39:36 +0000
@@ -16,7 +16,7 @@
 #    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
+from six import StringIO
 
 from cloudinit.distros.parsers import chop_comment
 
 
=== modified file 'cloudinit/distros/parsers/resolv_conf.py'
--- cloudinit/distros/parsers/resolv_conf.py	2013-03-19 13:32:04 +0000
+++ cloudinit/distros/parsers/resolv_conf.py	2014-07-08 04:39:36 +0000
@@ -16,7 +16,7 @@
 #    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
+from six import StringIO
 
 from cloudinit import util
 
 
=== modified file 'cloudinit/distros/parsers/sys_conf.py'
--- cloudinit/distros/parsers/sys_conf.py	2012-11-12 22:30:08 +0000
+++ cloudinit/distros/parsers/sys_conf.py	2014-07-08 04:39:36 +0000
@@ -16,11 +16,11 @@
 #    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 pipes
 import re
 
+import six
+
 # This library is used to parse/write
 # out the various sysconfig files edited (best attempt effort)
 #
@@ -61,15 +61,15 @@
 
     def __str__(self):
         contents = self.write()
-        out_contents = StringIO()
+        out_contents = six.StringIO()
         if isinstance(contents, (list, tuple)):
             out_contents.write("\n".join(contents))
         else:
-            out_contents.write(str(contents))
+            out_contents.write(six.text_type(contents))
         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 ''
 
=== modified file 'cloudinit/distros/rhel.py'
--- cloudinit/distros/rhel.py	2014-02-03 22:03:14 +0000
+++ cloudinit/distros/rhel.py	2014-07-08 04:39:36 +0000
@@ -20,6 +20,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/>.
 
+import six
+
 from cloudinit import distros
 from cloudinit import helpers
 from cloudinit import log as logging
@@ -71,7 +73,7 @@
         nameservers = []
         searchservers = []
         dev_names = entries.keys()
-        for (dev, info) in entries.iteritems():
+        for (dev, info) in six.iteritems(entries):
             net_fn = self.network_script_tpl % (dev)
             net_cfg = {
                 'DEVICE': dev,
 
=== modified file 'cloudinit/distros/sles.py'
--- cloudinit/distros/sles.py	2014-01-23 19:06:13 +0000
+++ cloudinit/distros/sles.py	2014-07-08 04:39:36 +0000
@@ -18,6 +18,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/>.
 
+import six
+
 from cloudinit import distros
 
 from cloudinit.distros.parsers.hostname import HostnameConf
@@ -62,7 +64,7 @@
         nameservers = []
         searchservers = []
         dev_names = entries.keys()
-        for (dev, info) in entries.iteritems():
+        for (dev, info) in six.iteritems(entries):
             net_fn = self.network_script_tpl % (dev)
             mode = info.get('auto')
             if mode and mode.lower() == 'true':
 
=== modified file 'cloudinit/ec2_utils.py'
--- cloudinit/ec2_utils.py	2014-02-08 20:20:33 +0000
+++ cloudinit/ec2_utils.py	2014-07-08 04:39:36 +0000
@@ -17,7 +17,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import functools
-import httplib
 import json
 
 from cloudinit import log as logging
@@ -25,7 +24,7 @@
 from cloudinit import util
 
 LOG = logging.getLogger(__name__)
-SKIP_USERDATA_CODES = frozenset([httplib.NOT_FOUND])
+SKIP_USERDATA_CODES = frozenset([url_helper.NOT_FOUND])
 
 
 def maybe_json_object(text):
@@ -116,7 +115,7 @@
         leaf_contents = {}
         for (field, resource) in leaves.items():
             leaf_url = url_helper.combine_url(base_url, resource)
-            leaf_blob = str(self._caller(leaf_url))
+            leaf_blob = self._caller(leaf_url).contents
             leaf_contents[field] = self._decode_leaf_blob(field, leaf_blob)
         joined = {}
         joined.update(child_contents)
@@ -153,7 +152,7 @@
                                          timeout=timeout,
                                          retries=retries,
                                          exception_cb=exception_cb)
-        user_data = str(response)
+        user_data = response.contents
     except url_helper.UrlError as e:
         if e.code not in SKIP_USERDATA_CODES:
             util.logexc(LOG, "Failed fetching userdata from url %s", ud_url)
@@ -173,7 +172,7 @@
 
     try:
         response = caller(md_url)
-        materializer = MetadataMaterializer(str(response), md_url, caller)
+        materializer = MetadataMaterializer(response.contents, md_url, caller)
         md = materializer.materialize()
         if not isinstance(md, (dict)):
             md = {}
 
=== modified file 'cloudinit/handlers/__init__.py'
--- cloudinit/handlers/__init__.py	2014-01-16 21:57:21 +0000
+++ cloudinit/handlers/__init__.py	2014-07-08 04:39:36 +0000
@@ -147,7 +147,7 @@
     if not modfname.endswith(".py"):
         modfname = "%s.py" % (modfname)
     # TODO(harlowja): Check if path exists??
-    util.write_file(modfname, payload, 0600)
+    util.write_file(modfname, payload, 0o600)
     handlers = pdata['handlers']
     try:
         mod = fixup_handler(importer.import_module(modname))
 
=== modified file 'cloudinit/handlers/boot_hook.py'
--- cloudinit/handlers/boot_hook.py	2013-07-21 16:34:26 +0000
+++ cloudinit/handlers/boot_hook.py	2014-07-08 04:39:36 +0000
@@ -50,7 +50,7 @@
         filepath = os.path.join(self.boothook_dir, filename)
         contents = util.strip_prefix_suffix(util.dos2unix(payload),
                                             prefix=BOOTHOOK_PREFIX)
-        util.write_file(filepath, contents.lstrip(), 0700)
+        util.write_file(filepath, contents.lstrip(), 0o700)
         return filepath
 
     def handle_part(self, _data, ctype, filename,  # pylint: disable=W0221
 
=== modified file 'cloudinit/handlers/cloud_config.py'
--- cloudinit/handlers/cloud_config.py	2014-01-09 00:16:24 +0000
+++ cloudinit/handlers/cloud_config.py	2014-07-08 04:39:36 +0000
@@ -95,7 +95,7 @@
             lines.append(util.yaml_dumps(self.cloud_buf))
         else:
             lines = []
-        util.write_file(self.cloud_fn, "\n".join(lines), 0600)
+        util.write_file(self.cloud_fn, "\n".join(lines), 0o600)
 
     def _extract_mergers(self, payload, headers):
         merge_header_headers = ''
 
=== modified file 'cloudinit/handlers/shell_script.py'
--- cloudinit/handlers/shell_script.py	2014-01-09 00:16:24 +0000
+++ cloudinit/handlers/shell_script.py	2014-07-08 04:39:36 +0000
@@ -53,4 +53,4 @@
         filename = util.clean_filename(filename)
         payload = util.dos2unix(payload)
         path = os.path.join(self.script_dir, filename)
-        util.write_file(path, payload, 0700)
+        util.write_file(path, payload, 0o700)
 
=== modified file 'cloudinit/handlers/upstart_job.py'
--- cloudinit/handlers/upstart_job.py	2013-07-21 16:26:44 +0000
+++ cloudinit/handlers/upstart_job.py	2014-07-08 04:39:36 +0000
@@ -66,7 +66,7 @@
 
         payload = util.dos2unix(payload)
         path = os.path.join(self.upstart_dir, filename)
-        util.write_file(path, payload, 0644)
+        util.write_file(path, payload, 0o644)
 
         if SUITABLE_UPSTART:
             util.subp(["initctl", "reload-configuration"], capture=False)
 
=== modified file 'cloudinit/helpers.py'
--- cloudinit/helpers.py	2014-01-17 20:12:31 +0000
+++ cloudinit/helpers.py	2014-07-08 04:39:36 +0000
@@ -23,10 +23,12 @@
 from time import time
 
 import contextlib
-import io
 import os
 
-from ConfigParser import (NoSectionError, NoOptionError, RawConfigParser)
+import six
+from six.moves.configparser import (NoSectionError,
+                                    NoOptionError,
+                                    RawConfigParser)
 
 from cloudinit.settings import (PER_INSTANCE, PER_ALWAYS, PER_ONCE,
                                 CFG_ENV_NAME)
@@ -318,10 +320,10 @@
         return self.registered[content_type]
 
     def items(self):
-        return self.registered.items()
+        return list(self.iteritems())
 
     def iteritems(self):
-        return self.registered.iteritems()
+        return six.iteritems(self.registered)
 
 
 class Paths(object):
@@ -449,7 +451,7 @@
 
     def stringify(self, header=None):
         contents = ''
-        with io.BytesIO() as outputstream:
+        with six.StringIO() as outputstream:
             self.write(outputstream)
             outputstream.flush()
             contents = outputstream.getvalue()
 
=== modified file 'cloudinit/log.py'
--- cloudinit/log.py	2013-04-17 16:42:55 +0000
+++ cloudinit/log.py	2014-07-08 04:39:36 +0000
@@ -28,7 +28,8 @@
 import os
 import sys
 
-from StringIO import StringIO
+import six
+from six import StringIO
 
 # Logging levels for easy access
 CRITICAL = logging.CRITICAL
@@ -72,13 +73,13 @@
 
     log_cfgs = []
     log_cfg = cfg.get('logcfg')
-    if log_cfg and isinstance(log_cfg, (str, basestring)):
+    if log_cfg and isinstance(log_cfg, six.string_types):
         # If there is a 'logcfg' entry in the config,
         # respect it, it is the old keyname
         log_cfgs.append(str(log_cfg))
     elif "log_cfgs" in cfg:
         for a_cfg in cfg['log_cfgs']:
-            if isinstance(a_cfg, (basestring, str)):
+            if isinstance(a_cfg, six.string_types):
                 log_cfgs.append(a_cfg)
             elif isinstance(a_cfg, (collections.Iterable)):
                 cfg_str = [str(c) for c in a_cfg]
 
=== modified file 'cloudinit/mergers/__init__.py'
--- cloudinit/mergers/__init__.py	2013-05-03 21:41:28 +0000
+++ cloudinit/mergers/__init__.py	2014-07-08 04:39:36 +0000
@@ -18,6 +18,8 @@
 
 import re
 
+import six
+
 from cloudinit import importer
 from cloudinit import log as logging
 from cloudinit import type_utils
@@ -100,7 +102,7 @@
         raw_mergers = config.pop('merge_type', None)
     if raw_mergers is None:
         return parsed_mergers
-    if isinstance(raw_mergers, (str, basestring)):
+    if isinstance(raw_mergers, six.string_types):
         return string_extract_mergers(raw_mergers)
     for m in raw_mergers:
         if isinstance(m, (dict)):
 
=== modified file 'cloudinit/mergers/m_dict.py'
--- cloudinit/mergers/m_dict.py	2013-05-03 22:05:45 +0000
+++ cloudinit/mergers/m_dict.py	2014-07-08 04:39:36 +0000
@@ -16,6 +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/>.
 
+import six
+
 DEF_MERGE_TYPE = 'no_replace'
 MERGE_TYPES = ('replace', DEF_MERGE_TYPE,)
 
@@ -57,7 +59,7 @@
                 return new_v
             if isinstance(new_v, (list, tuple)) and self._recurse_array:
                 return self._merger.merge(old_v, new_v)
-            if isinstance(new_v, (basestring)) and self._recurse_str:
+            if isinstance(new_v, six.string_types) and self._recurse_str:
                 return self._merger.merge(old_v, new_v)
             if isinstance(new_v, (dict)) and self._recurse_dict:
                 return self._merger.merge(old_v, new_v)
 
=== modified file 'cloudinit/mergers/m_list.py'
--- cloudinit/mergers/m_list.py	2013-06-19 06:46:54 +0000
+++ cloudinit/mergers/m_list.py	2014-07-08 04:39:36 +0000
@@ -16,6 +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/>.
 
+import six
+
 DEF_MERGE_TYPE = 'replace'
 MERGE_TYPES = ('append', 'prepend', DEF_MERGE_TYPE, 'no_replace')
 
@@ -73,7 +75,7 @@
                 return old_v
             if isinstance(new_v, (list, tuple)) and self._recurse_array:
                 return self._merger.merge(old_v, new_v)
-            if isinstance(new_v, (str, basestring)) and self._recurse_str:
+            if isinstance(new_v, six.string_types) and self._recurse_str:
                 return self._merger.merge(old_v, new_v)
             if isinstance(new_v, (dict)) and self._recurse_dict:
                 return self._merger.merge(old_v, new_v)
 
=== modified file 'cloudinit/mergers/m_str.py'
--- cloudinit/mergers/m_str.py	2013-05-03 21:41:28 +0000
+++ cloudinit/mergers/m_str.py	2014-07-08 04:39:36 +0000
@@ -17,6 +17,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/>.
 
+import six
+
 
 class Merger(object):
     def __init__(self, _merger, opts):
@@ -34,11 +36,11 @@
     # perform the following action, if appending we will
     # merge them together, otherwise we will just return value.
     def _on_str(self, value, merge_with):
-        if not isinstance(value, (basestring)):
+        if not isinstance(value, six.string_types):
             return merge_with
         if not self._append:
             return merge_with
-        if isinstance(value, unicode):
-            return value + unicode(merge_with)
+        if isinstance(value, six.text_type):
+            return value + six.text_type(merge_with)
         else:
-            return value + str(merge_with)
+            return value + six.binary_type(merge_with)
 
=== modified file 'cloudinit/netinfo.py'
--- cloudinit/netinfo.py	2014-02-26 18:14:55 +0000
+++ cloudinit/netinfo.py	2014-07-08 04:39:36 +0000
@@ -20,10 +20,12 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import cloudinit.util as util
 import re
 
 from prettytable import PrettyTable
+import six
+
+import cloudinit.util as util
 
 
 def netdev_info(empty=""):
@@ -83,7 +85,7 @@
                     devs[curdev][target] = toks[i][len(field) + 1:]
 
     if empty != "":
-        for (_devname, dev) in devs.iteritems():
+        for (_devname, dev) in six.iteritems(devs):
             for field in dev:
                 if dev[field] == "":
                     dev[field] = empty
@@ -155,7 +157,7 @@
     if netdev is not None:
         fields = ['Device', 'Up', 'Address', 'Mask', 'Hw-Address']
         tbl = PrettyTable(fields)
-        for (dev, d) in netdev.iteritems():
+        for (dev, d) in six.iteritems(netdev):
             tbl.add_row([dev, d["up"], d["addr"], d["mask"], d["hwaddr"]])
         netdev_s = tbl.get_string()
         max_len = len(max(netdev_s.splitlines(), key=len))
 
=== modified file 'cloudinit/signal_handler.py'
--- cloudinit/signal_handler.py	2012-09-19 20:33:56 +0000
+++ cloudinit/signal_handler.py	2014-07-08 04:39:36 +0000
@@ -22,7 +22,7 @@
 import signal
 import sys
 
-from StringIO import StringIO
+from six import StringIO
 
 from cloudinit import log as logging
 from cloudinit import util
 
=== modified file 'cloudinit/sources/DataSourceConfigDrive.py'
--- cloudinit/sources/DataSourceConfigDrive.py	2014-02-25 01:17:07 +0000
+++ cloudinit/sources/DataSourceConfigDrive.py	2014-07-08 04:39:36 +0000
@@ -20,6 +20,8 @@
 
 import os
 
+import six
+
 from cloudinit import log as logging
 from cloudinit import sources
 from cloudinit import util
@@ -198,7 +200,7 @@
     files = data.get('files', {})
     if files:
         LOG.debug("Writing %s injected files", len(files))
-        for (filename, content) in files.iteritems():
+        for (filename, content) in six.iteritems(files):
             if not filename.startswith(os.sep):
                 filename = os.sep + filename
             try:
 
=== modified file 'cloudinit/sources/DataSourceEc2.py'
--- cloudinit/sources/DataSourceEc2.py	2014-02-01 20:03:32 +0000
+++ cloudinit/sources/DataSourceEc2.py	2014-07-08 04:39:36 +0000
@@ -23,6 +23,8 @@
 import os
 import time
 
+import six
+
 from cloudinit import ec2_utils as ec2
 from cloudinit import log as logging
 from cloudinit import sources
@@ -156,8 +158,8 @@
         # 'ephemeral0': '/dev/sdb',
         # 'root': '/dev/sda1'}
         found = None
-        bdm_items = self.metadata['block-device-mapping'].iteritems()
-        for (entname, device) in bdm_items:
+        bdms = self.metadata['block-device-mapping']
+        for (entname, device) in six.iteritems(bdms):
             if entname == name:
                 found = device
                 break
 
=== modified file 'cloudinit/sources/DataSourceMAAS.py'
--- cloudinit/sources/DataSourceMAAS.py	2013-04-25 15:58:38 +0000
+++ cloudinit/sources/DataSourceMAAS.py	2014-07-08 04:39:36 +0000
@@ -20,11 +20,14 @@
 
 from email.utils import parsedate
 import errno
-import oauth.oauth as oauth
 import os
 import time
 import urllib2
 
+import oauth.oauth as oauth
+
+import six
+
 from cloudinit import log as logging
 from cloudinit import sources
 from cloudinit import url_helper
@@ -262,7 +265,7 @@
 
     userdata = content.get('user-data', "")
     md = {}
-    for (key, val) in content.iteritems():
+    for (key, val) in six.iteritems(content):
         if key == 'user-data':
             continue
         md[key] = val
 
=== modified file 'cloudinit/sources/DataSourceOVF.py'
--- cloudinit/sources/DataSourceOVF.py	2013-06-07 17:30:03 +0000
+++ cloudinit/sources/DataSourceOVF.py	2014-07-08 04:39:36 +0000
@@ -26,6 +26,8 @@
 import os
 import re
 
+import six
+
 from cloudinit import log as logging
 from cloudinit import sources
 from cloudinit import util
@@ -66,7 +68,7 @@
             np = {'iso': transport_iso9660,
                   'vmware-guestd': transport_vmware_guestd, }
             name = None
-            for (name, transfunc) in np.iteritems():
+            for (name, transfunc) in six.iteritems(np):
                 (contents, _dev, _fname) = transfunc()
                 if contents:
                     break
@@ -138,7 +140,7 @@
     ud = ""
     cfg_props = ['password']
     md_props = ['seedfrom', 'local-hostname', 'public-keys', 'instance-id']
-    for (prop, val) in props.iteritems():
+    for (prop, val) in six.iteritems(props):
         if prop == 'hostname':
             prop = "local-hostname"
         if prop in md_props:
@@ -183,7 +185,7 @@
 
     # Go through mounts to see if it was already mounted
     mounts = util.mounts()
-    for (dev, info) in mounts.iteritems():
+    for (dev, info) in six.iteritems(mounts):
         fstype = info['fstype']
         if fstype != "iso9660" and require_iso:
             continue
 
=== modified file 'cloudinit/sources/DataSourceSmartOS.py'
--- cloudinit/sources/DataSourceSmartOS.py	2014-06-02 20:56:31 +0000
+++ cloudinit/sources/DataSourceSmartOS.py	2014-07-08 04:39:36 +0000
@@ -30,13 +30,15 @@
 #       Comments with "@datadictionary" are snippets of the definition
 
 import base64
+import os
+import os.path
+
+import serial
+import six
+
 from cloudinit import log as logging
 from cloudinit import sources
 from cloudinit import util
-import os
-import os.path
-import serial
-
 
 LOG = logging.getLogger(__name__)
 
@@ -201,7 +203,7 @@
         if b64_all is not None:
             self.b64_all = util.is_true(b64_all)
 
-        for ci_noun, attribute in SMARTOS_ATTRIB_MAP.iteritems():
+        for ci_noun, attribute in six.iteritems(SMARTOS_ATTRIB_MAP):
             smartos_noun, strip = attribute
             md[ci_noun] = self.query(smartos_noun, strip=strip)
 
 
=== modified file 'cloudinit/sources/__init__.py'
--- cloudinit/sources/__init__.py	2014-01-23 20:17:17 +0000
+++ cloudinit/sources/__init__.py	2014-07-08 04:39:36 +0000
@@ -23,6 +23,8 @@
 import abc
 import os
 
+import six
+
 from cloudinit import importer
 from cloudinit import log as logging
 from cloudinit import type_utils
@@ -130,7 +132,7 @@
         # we want to return the correct value for what will actually
         # exist in this instance
         mappings = {"sd": ("vd", "xvd", "vtb")}
-        for (nfrom, tlist) in mappings.iteritems():
+        for (nfrom, tlist) in six.iteritems(mappings):
             if not short_name.startswith(nfrom):
                 continue
             for nto in tlist:
@@ -218,18 +220,18 @@
     if not pubkey_data:
         return keys
 
-    if isinstance(pubkey_data, (basestring, str)):
+    if isinstance(pubkey_data, six.string_types):
         return str(pubkey_data).splitlines()
 
     if isinstance(pubkey_data, (list, set)):
         return list(pubkey_data)
 
     if isinstance(pubkey_data, (dict)):
-        for (_keyname, klist) in pubkey_data.iteritems():
+        for (_keyname, klist) in six.iteritems(pubkey_data):
             # lp:506332 uec metadata service responds with
             # data that makes boto populate a string for 'klist' rather
             # than a list.
-            if isinstance(klist, (str, basestring)):
+            if isinstance(klist, six.string_types):
                 klist = [klist]
             if isinstance(klist, (list, set)):
                 for pkey in klist:
 
=== modified file 'cloudinit/sources/helpers/openstack.py'
--- cloudinit/sources/helpers/openstack.py	2014-02-24 22:41:42 +0000
+++ cloudinit/sources/helpers/openstack.py	2014-07-08 04:39:36 +0000
@@ -23,6 +23,8 @@
 import copy
 import os
 
+import six
+
 from cloudinit import ec2_utils
 from cloudinit import log as logging
 from cloudinit import sources
@@ -224,7 +226,7 @@
             'version': 2,
         }
         data = datafiles(version)
-        for (name, (path, required, translator)) in data.iteritems():
+        for (name, (path, required, translator)) in six.iteritems(data):
             path = self._path_join(self.base_path, path)
             data = None
             found = False
@@ -344,7 +346,7 @@
             raise NonReadable("%s: no files found" % (self.base_path))
 
         md = {}
-        for (name, (key, translator, default)) in FILES_V1.iteritems():
+        for (name, (key, translator, default)) in six.iteritems(FILES_V1):
             if name in found:
                 path = found[name]
                 try:
 
=== modified file 'cloudinit/ssh_util.py'
--- cloudinit/ssh_util.py	2013-06-19 06:44:00 +0000
+++ cloudinit/ssh_util.py	2014-07-08 04:39:36 +0000
@@ -239,7 +239,7 @@
     # Make sure the users .ssh dir is setup accordingly
     (ssh_dir, pwent) = users_ssh_info(username)
     if not os.path.isdir(ssh_dir):
-        util.ensure_dir(ssh_dir, mode=0700)
+        util.ensure_dir(ssh_dir, mode=0o700)
         util.chownbyid(ssh_dir, pwent.pw_uid, pwent.pw_gid)
 
     # Turn the 'update' keys given into actual entries
@@ -252,8 +252,8 @@
     (auth_key_fn, auth_key_entries) = extract_authorized_keys(username)
     with util.SeLinuxGuard(ssh_dir, recursive=True):
         content = update_authorized_keys(auth_key_entries, key_entries)
-        util.ensure_dir(os.path.dirname(auth_key_fn), mode=0700)
-        util.write_file(auth_key_fn, content, mode=0600)
+        util.ensure_dir(os.path.dirname(auth_key_fn), mode=0o700)
+        util.write_file(auth_key_fn, content, mode=0o600)
         util.chownbyid(auth_key_fn, pwent.pw_uid, pwent.pw_gid)
 
 
 
=== modified file 'cloudinit/stages.py'
--- cloudinit/stages.py	2014-02-13 18:53:08 +0000
+++ cloudinit/stages.py	2014-07-08 04:39:36 +0000
@@ -20,12 +20,13 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import cPickle as pickle
-
 import copy
 import os
+import pickle
 import sys
 
+import six
+
 from cloudinit.settings import (PER_INSTANCE, FREQUENCIES, CLOUD_CONFIG)
 
 from cloudinit import handlers
@@ -202,7 +203,7 @@
             util.logexc(LOG, "Failed pickling datasource %s", self.datasource)
             return False
         try:
-            util.write_file(pickled_fn, pk_contents, mode=0400)
+            util.write_file(pickled_fn, pk_contents, mode=0o400)
         except Exception:
             util.logexc(LOG, "Failed pickling datasource to %s", pickled_fn)
             return False
@@ -324,15 +325,15 @@
 
     def _store_userdata(self):
         raw_ud = "%s" % (self.datasource.get_userdata_raw())
-        util.write_file(self._get_ipath('userdata_raw'), raw_ud, 0600)
+        util.write_file(self._get_ipath('userdata_raw'), raw_ud, 0o600)
         processed_ud = "%s" % (self.datasource.get_userdata())
-        util.write_file(self._get_ipath('userdata'), processed_ud, 0600)
+        util.write_file(self._get_ipath('userdata'), processed_ud, 0o600)
 
     def _store_vendordata(self):
         raw_vd = "%s" % (self.datasource.get_vendordata_raw())
-        util.write_file(self._get_ipath('vendordata_raw'), raw_vd, 0600)
+        util.write_file(self._get_ipath('vendordata_raw'), raw_vd, 0o600)
         processed_vd = "%s" % (self.datasource.get_vendordata())
-        util.write_file(self._get_ipath('vendordata'), processed_vd, 0600)
+        util.write_file(self._get_ipath('vendordata'), processed_vd, 0o600)
 
     def _default_handlers(self, opts=None):
         if opts is None:
@@ -384,7 +385,7 @@
             if not path or not os.path.isdir(path):
                 return
             potential_handlers = util.find_modules(path)
-            for (fname, mod_name) in potential_handlers.iteritems():
+            for (fname, mod_name) in six.iteritems(potential_handlers):
                 try:
                     mod_locs = importer.find_module(mod_name, [''],
                                                     ['list_types',
@@ -574,7 +575,7 @@
         for item in cfg_mods:
             if not item:
                 continue
-            if isinstance(item, (str, basestring)):
+            if isinstance(item, six.string_types):
                 module_list.append({
                     'mod': item.strip(),
                 })
 
=== modified file 'cloudinit/type_utils.py'
--- cloudinit/type_utils.py	2013-03-07 03:24:05 +0000
+++ cloudinit/type_utils.py	2014-07-08 04:39:36 +0000
@@ -24,11 +24,30 @@
 
 import types
 
+import six
+
+if six.PY3:
+    _NAME_TYPES = (
+        types.ModuleType,
+        types.FunctionType,
+        types.LambdaType,
+        type,
+    )
+else:
+    _NAME_TYPES = (
+        types.TypeType,
+        types.ModuleType,
+        types.FunctionType,
+        types.LambdaType,
+        types.ClassType,
+    )
+
 
 def obj_name(obj):
-    if isinstance(obj, (types.TypeType,
-                        types.ModuleType,
-                        types.FunctionType,
-                        types.LambdaType)):
-        return str(obj.__name__)
-    return obj_name(obj.__class__)
+    if isinstance(obj, _NAME_TYPES):
+        return six.text_type(obj.__name__)
+    else:
+        if not hasattr(obj, '__class__'):
+            return repr(obj)
+        else:
+            return obj_name(obj.__class__)
 
=== modified file 'cloudinit/url_helper.py'
--- cloudinit/url_helper.py	2014-02-13 17:13:42 +0000
+++ cloudinit/url_helper.py	2014-07-08 04:39:36 +0000
@@ -20,21 +20,28 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import httplib
+import six
+
 import time
-import urllib
 
 import requests
 from requests import exceptions
 
-from urlparse import (urlparse, urlunparse)
+from six.moves.urllib.parse import (urlparse, urlunparse)
+from six.moves.urllib.parse import quote as urlquote
 
 from cloudinit import log as logging
 from cloudinit import version
 
 LOG = logging.getLogger(__name__)
 
-NOT_FOUND = httplib.NOT_FOUND
+if six.PY2:
+    import httplib
+    NOT_FOUND = httplib.NOT_FOUND
+else:
+    import http.client
+    NOT_FOUND = http.client.NOT_FOUND
+
 
 # Check if requests has ssl support (added in requests >= 0.8.8)
 SSL_ENABLED = False
@@ -70,7 +77,7 @@
         path = url_parsed[2]
         if path and not path.endswith("/"):
             path += "/"
-        path += urllib.quote(str(add_on), safe="/:")
+        path += urlquote(str(add_on), safe="/:")
         url_parsed[2] = path
         return urlunparse(url_parsed)
 
@@ -111,7 +118,7 @@
 
     @property
     def contents(self):
-        return self._response.content
+        return self._response.text
 
     @property
     def url(self):
@@ -135,7 +142,7 @@
         return self._response.status_code
 
     def __str__(self):
-        return self.contents
+        return self._response.text
 
 
 class UrlError(IOError):
 
=== modified file 'cloudinit/user_data.py'
--- cloudinit/user_data.py	2014-01-24 20:29:09 +0000
+++ cloudinit/user_data.py	2014-07-08 04:39:36 +0000
@@ -29,6 +29,8 @@
 from email.mime.nonmultipart import MIMENonMultipart
 from email.mime.text import MIMEText
 
+import six
+
 from cloudinit import handlers
 from cloudinit import log as logging
 from cloudinit import util
@@ -235,9 +237,9 @@
                 resp = util.read_file_or_url(include_url,
                                              ssl_details=self.ssl_details)
                 if include_once_on and resp.ok():
-                    util.write_file(include_once_fn, str(resp), mode=0600)
+                    util.write_file(include_once_fn, resp.contents, mode=0o600)
                 if resp.ok():
-                    content = str(resp)
+                    content = resp.contents
                 else:
                     LOG.warn(("Fetching from %s resulted in"
                               " a invalid http code of %s"),
@@ -256,7 +258,7 @@
             #    filename and type not be present
             # or
             #  scalar(payload)
-            if isinstance(ent, (str, basestring)):
+            if isinstance(ent, six.string_types):
                 ent = {'content': ent}
             if not isinstance(ent, (dict)):
                 # TODO(harlowja) raise?
@@ -337,7 +339,7 @@
     data = util.decomp_gzip(raw_data)
     if "mime-version:" in data[0:4096].lower():
         msg = email.message_from_string(data)
-        for (key, val) in headers.iteritems():
+        for (key, val) in six.iteritems(headers):
             _replace_header(msg, key, val)
     else:
         mtype = headers.get(CONTENT_TYPE, NOT_MULTIPART_TYPE)
 
=== modified file 'cloudinit/util.py'
--- cloudinit/util.py	2014-02-24 22:20:12 +0000
+++ cloudinit/util.py	2014-07-08 04:39:36 +0000
@@ -22,8 +22,6 @@
 #
 # pylint: disable=C0302
 
-from StringIO import StringIO
-
 import contextlib
 import copy as obj_copy
 import ctypes
@@ -47,8 +45,10 @@
 import sys
 import tempfile
 import time
-import urlparse
-
+
+from six.moves.urllib import parse as urlparse
+
+import six
 import yaml
 
 from cloudinit import importer
@@ -71,8 +71,25 @@
 }
 FN_ALLOWED = ('_-.()' + string.digits + string.ascii_letters)
 
+TRUE_STRINGS = ('true', '1', 'on', 'yes')
+FALSE_STRINGS = ('off', '0', 'no', 'false')
+
 # Helper utils to see if running in a container
-CONTAINER_TESTS = ['running-in-container', 'lxc-is-container']
+CONTAINER_TESTS = ('running-in-container', 'lxc-is-container')
+
+
+def decode_binary(blob, encoding='utf-8'):
+    # Converts a binary type into a text type using given encoding.
+    if isinstance(blob, six.text_type):
+        return blob
+    return blob.decode(encoding)
+
+
+def encode_text(text, encoding='utf-8'):
+    # Converts a text string into a binary type using given encoding.
+    if isinstance(text, six.binary_type):
+        return text
+    return text.encode(encoding)
 
 
 class ProcessExecutionError(IOError):
@@ -149,7 +166,8 @@
         if self.selinux and self.selinux.is_selinux_enabled():
             path = os.path.realpath(os.path.expanduser(self.path))
             # path should be a string, not unicode
-            path = str(path)
+            if six.PY2:
+                path = str(path)
             do_restore = False
             try:
                 # See if even worth restoring??
@@ -211,10 +229,10 @@
 def is_true(val, addons=None):
     if isinstance(val, (bool)):
         return val is True
-    check_set = ['true', '1', 'on', 'yes']
+    check_set = TRUE_STRINGS
     if addons:
-        check_set = check_set + addons
-    if str(val).lower().strip() in check_set:
+        check_set = list(check_set) + addons
+    if six.text_type(val).lower().strip() in check_set:
         return True
     return False
 
@@ -222,10 +240,10 @@
 def is_false(val, addons=None):
     if isinstance(val, (bool)):
         return val is False
-    check_set = ['off', '0', 'no', 'false']
+    check_set = FALSE_STRINGS
     if addons:
-        check_set = check_set + addons
-    if str(val).lower().strip() in check_set:
+        check_set = list(check_set) + addons
+    if six.text_type(val).lower().strip() in check_set:
         return True
     return False
 
@@ -275,7 +293,7 @@
 def uniq_merge(*lists):
     combined_list = []
     for a_list in lists:
-        if isinstance(a_list, (str, basestring)):
+        if isinstance(a_list, six.string_types):
             a_list = a_list.strip().split(",")
             # Kickout the empty ones
             a_list = [a for a in a_list if len(a)]
@@ -284,7 +302,7 @@
 
 
 def clean_filename(fn):
-    for (k, v) in FN_REPLACEMENTS.iteritems():
+    for (k, v) in six.iteritems(FN_REPLACEMENTS):
         fn = fn.replace(k, v)
     removals = []
     for k in fn:
@@ -298,14 +316,14 @@
 
 def decomp_gzip(data, quiet=True):
     try:
-        buf = StringIO(str(data))
+        buf = six.BytesIO(encode_text(data))
         with contextlib.closing(gzip.GzipFile(None, "rb", 1, buf)) as gh:
-            return gh.read()
+            return decode_binary(gh.read())
     except Exception as e:
         if quiet:
             return data
         else:
-            raise DecompressionError(str(e))
+            raise DecompressionError(six.text_type(e))
 
 
 def extract_usergroup(ug_pair):
@@ -364,7 +382,7 @@
 
 
 def load_json(text, root_types=(dict,)):
-    decoded = json.loads(text)
+    decoded = json.loads(decode_binary(text))
     if not isinstance(decoded, tuple(root_types)):
         expected_types = ", ".join([str(t) for t in root_types])
         raise TypeError("(%s) root types expected, got %s instead"
@@ -396,7 +414,7 @@
     if key not in yobj:
         return default
     val = yobj[key]
-    if not isinstance(val, (str, basestring)):
+    if not isinstance(val, six.string_types):
         val = str(val)
     return val
 
@@ -431,7 +449,7 @@
     if isinstance(val, (list)):
         cval = [v for v in val]
         return cval
-    if not isinstance(val, (basestring)):
+    if not isinstance(val, six.string_types):
         val = str(val)
     return [val]
 
@@ -706,11 +724,11 @@
 
 def load_yaml(blob, default=None, allowed=(dict,)):
     loaded = default
+    blob = decode_binary(blob)
     try:
-        blob = str(blob)
-        LOG.debug(("Attempting to load yaml from string "
-                 "of length %s with allowed root types %s"),
-                 len(blob), allowed)
+        LOG.debug("Attempting to load yaml from string "
+                  "of length %s with allowed root types %s",
+                  len(blob), allowed)
         converted = safeyaml.load(blob)
         if not isinstance(converted, allowed):
             # Yes this will just be caught, but thats ok for now...
@@ -744,14 +762,12 @@
     md_resp = read_file_or_url(md_url, timeout, retries, file_retries)
     md = None
     if md_resp.ok():
-        md_str = str(md_resp)
-        md = load_yaml(md_str, default={})
+        md = load_yaml(md_resp.contents, default={})
 
     ud_resp = read_file_or_url(ud_url, timeout, retries, file_retries)
     ud = None
     if ud_resp.ok():
-        ud_str = str(ud_resp)
-        ud = ud_str
+        ud = ud_resp.contents
 
     return (md, ud)
 
@@ -782,7 +798,7 @@
     if "conf_d" in cfg:
         confd = cfg['conf_d']
         if confd:
-            if not isinstance(confd, (str, basestring)):
+            if not isinstance(confd, six.string_types):
                 raise TypeError(("Config file %s contains 'conf_d' "
                                  "with non-string type %s") %
                                  (cfgfile, type_utils.obj_name(confd)))
@@ -919,8 +935,8 @@
         return (None, None, None)
 
     resp = read_file_or_url(url)
-    if resp.contents.startswith(starts) and resp.ok():
-        return (key, url, str(resp))
+    if resp.ok() and resp.contents.startswith(starts):
+        return (key, url, resp.contents)
 
     return (key, url, None)
 
@@ -1074,9 +1090,9 @@
     return out_list
 
 
-def load_file(fname, read_cb=None, quiet=False):
+def load_file(fname, read_cb=None, quiet=False, decode=True):
     LOG.debug("Reading from %s (quiet=%s)", fname, quiet)
-    ofh = StringIO()
+    ofh = six.BytesIO()
     try:
         with open(fname, 'rb') as ifh:
             pipe_in_out(ifh, ofh, chunk_cb=read_cb)
@@ -1087,7 +1103,10 @@
             raise
     contents = ofh.getvalue()
     LOG.debug("Read %s bytes from %s", len(contents), fname)
-    return contents
+    if decode:
+        return decode_binary(contents)
+    else:
+        return contents
 
 
 def get_cmdline():
@@ -1217,7 +1236,7 @@
 
 def hash_blob(blob, routine, mlen=None):
     hasher = hashlib.new(routine)
-    hasher.update(blob)
+    hasher.update(encode_text(blob))
     digest = hasher.hexdigest()
     # Don't get to long now
     if mlen is not None:
@@ -1248,7 +1267,7 @@
     os.rename(src, dest)
 
 
-def ensure_dirs(dirlist, mode=0755):
+def ensure_dirs(dirlist, mode=0o755):
     for d in dirlist:
         ensure_dir(d, mode)
 
@@ -1262,7 +1281,7 @@
             return
         try:
             if key and content:
-                write_file(target_fn, content, mode=0600)
+                write_file(target_fn, content, mode=0o600)
                 LOG.debug(("Wrote to %s with contents of command line"
                           " url %s (len=%s)"), target_fn, url, len(content))
             elif key and not content:
@@ -1454,7 +1473,7 @@
     write_file(path, content, omode="ab", mode=None)
 
 
-def ensure_file(path, mode=0644):
+def ensure_file(path, mode=0o644):
     write_file(path, content='', omode="ab", mode=mode)
 
 
@@ -1472,7 +1491,7 @@
             os.chmod(path, real_mode)
 
 
-def write_file(filename, content, mode=0644, omode="wb"):
+def write_file(filename, content, mode=0o644, omode="wb"):
     """
     Writes a file with the given content and sets the file mode as specified.
     Resotres the SELinux context if possible.
@@ -1480,11 +1499,17 @@
     @param filename: The full path of the file to write.
     @param content: The content to write to the file.
     @param mode: The filesystem mode to set on the file.
-    @param omode: The open mode used when opening the file (r, rb, a, etc.)
+    @param omode: The open mode used when opening the file (w, wb, a, etc.)
     """
     ensure_dir(os.path.dirname(filename))
-    LOG.debug("Writing to %s - %s: [%s] %s bytes",
-               filename, omode, mode, len(content))
+    if 'b' in omode.lower():
+        content = encode_text(content)
+        write_type = 'bytes'
+    else:
+        content = decode_binary(content)
+        write_type = 'characters'
+    LOG.debug("Writing to %s - %s: [%s] %s %s",
+               filename, omode, mode, len(content), write_type)
     with SeLinuxGuard(path=filename):
         with open(filename, omode) as fh:
             fh.write(content)
@@ -1573,10 +1598,10 @@
         if isinstance(args, list):
             fixed = []
             for f in args:
-                fixed.append("'%s'" % (str(f).replace("'", escaped)))
+                fixed.append("'%s'" % (six.text_type(f).replace("'", escaped)))
             content = "%s%s\n" % (content, ' '.join(fixed))
             cmds_made += 1
-        elif isinstance(args, (str, basestring)):
+        elif isinstance(args, six.string_types):
             content = "%s%s\n" % (content, args)
             cmds_made += 1
         else:
@@ -1687,7 +1712,7 @@
 
     pkglist = []
     for pkg in pkgs:
-        if isinstance(pkg, basestring):
+        if isinstance(pkg, six.string_types):
             pkglist.append(pkg)
             continue
 
 
=== modified file 'packages/bddeb'
--- packages/bddeb	2014-01-17 22:08:58 +0000
+++ packages/bddeb	2014-07-08 04:39:36 +0000
@@ -37,6 +37,7 @@
     'pyserial': 'python-serial',
     'pyyaml': 'python-yaml',
     'requests': 'python-requests',
+    'six': 'python-six',
 }
 DEBUILD_ARGS = ["-us", "-S", "-uc", "-d"]
 
 
=== modified file 'packages/brpm'
--- packages/brpm	2014-01-17 22:08:58 +0000
+++ packages/brpm	2014-07-08 04:39:36 +0000
@@ -44,6 +44,7 @@
         'pyserial': 'pyserial',
         'pyyaml': 'PyYAML',
         'requests': 'python-requests',
+        'six': 'python-six',
     },
     'suse': {
         'argparse': 'python-argparse',
@@ -55,6 +56,7 @@
         'pyserial': 'python-pyserial',
         'pyyaml': 'python-yaml',
         'requests': 'python-requests',
+        'six': 'python-six',
     }
 }
 
 
=== modified file 'requirements.txt'
--- requirements.txt	2014-02-12 10:14:49 +0000
+++ requirements.txt	2014-07-08 04:39:36 +0000
@@ -31,3 +31,6 @@
 
 # For patching pieces of cloud-config together
 jsonpatch
+
+# For py2/3 simultaneous compatibility
+six
 
=== modified file 'tests/unittests/test_data.py'
--- tests/unittests/test_data.py	2014-01-17 15:27:09 +0000
+++ tests/unittests/test_data.py	2014-07-08 04:39:36 +0000
@@ -1,11 +1,12 @@
 """Tests for handling of userdata within cloud init."""
 
-import StringIO
-
 import gzip
 import logging
 import os
 
+from six import BytesIO
+from six import StringIO
+
 from email.mime.application import MIMEApplication
 from email.mime.base import MIMEBase
 from email.mime.multipart import MIMEMultipart
@@ -53,7 +54,7 @@
         self.patchUtils(root)
 
     def capture_log(self, lvl=logging.DEBUG):
-        log_file = StringIO.StringIO()
+        log_file = StringIO()
         self._log_handler = logging.StreamHandler(log_file)
         self._log_handler.setLevel(lvl)
         self._log = log.getLogger()
@@ -352,9 +353,9 @@
         """Tests that individual message gzip encoding works."""
 
         def gzip_part(text):
-            contents = StringIO.StringIO()
-            f = gzip.GzipFile(fileobj=contents, mode='w')
-            f.write(str(text))
+            contents = BytesIO()
+            f = gzip.GzipFile(fileobj=contents, mode='wb')
+            f.write(util.encode_text(text))
             f.flush()
             f.close()
             return MIMEApplication(contents.getvalue(), 'gzip')
 
=== modified file 'tests/unittests/test_datasource/test_nocloud.py'
--- tests/unittests/test_datasource/test_nocloud.py	2014-02-26 19:28:46 +0000
+++ tests/unittests/test_datasource/test_nocloud.py	2014-07-08 04:39:36 +0000
@@ -86,7 +86,7 @@
 
         data = {
             'fs_label': None,
-            'meta-data': {'instance-id': 'IID'},
+            'meta-data': yaml.safe_dump({'instance-id': 'IID'}),
             'user-data': "USER_DATA_RAW",
         }
 
 
=== modified file 'tests/unittests/test_datasource/test_openstack.py'
--- tests/unittests/test_datasource/test_openstack.py	2014-02-08 20:20:33 +0000
+++ tests/unittests/test_datasource/test_openstack.py	2014-07-08 04:39:36 +0000
@@ -20,9 +20,8 @@
 import json
 import re
 
-from StringIO import StringIO
-
-from urlparse import urlparse
+from six import StringIO
+from six.moves.urllib.parse import urlparse
 
 from tests.unittests import helpers as test_helpers
 
 
=== modified file 'tests/unittests/test_distros/test_netconfig.py'
--- tests/unittests/test_distros/test_netconfig.py	2012-10-11 19:49:45 +0000
+++ tests/unittests/test_distros/test_netconfig.py	2014-07-08 04:39:36 +0000
@@ -4,6 +4,8 @@
 
 import os
 
+from six import StringIO
+
 from cloudinit import distros
 from cloudinit import helpers
 from cloudinit import settings
@@ -11,9 +13,6 @@
 
 from cloudinit.distros.parsers.sys_conf import SysConf
 
-from StringIO import StringIO
-
-
 BASE_NET_CFG = '''
 auto lo
 iface lo inet loopback
 
=== modified file 'tests/unittests/test_handler/test_handler_locale.py'
--- tests/unittests/test_handler/test_handler_locale.py	2013-06-25 06:57:27 +0000
+++ tests/unittests/test_handler/test_handler_locale.py	2014-07-08 04:39:36 +0000
@@ -29,7 +29,7 @@
 
 from configobj import ConfigObj
 
-from StringIO import StringIO
+from six import BytesIO
 
 import logging
 
@@ -59,6 +59,6 @@
         cc = self._get_cloud('sles')
         cc_locale.handle('cc_locale', cfg, cc, LOG, [])
 
-        contents = util.load_file('/etc/sysconfig/language')
-        n_cfg = ConfigObj(StringIO(contents))
+        contents = util.load_file('/etc/sysconfig/language', decode=False)
+        n_cfg = ConfigObj(BytesIO(contents))
         self.assertEquals({'RC_LANG': cfg['locale']}, dict(n_cfg))
 
=== modified file 'tests/unittests/test_handler/test_handler_seed_random.py'
--- tests/unittests/test_handler/test_handler_seed_random.py	2014-03-04 19:35:09 +0000
+++ tests/unittests/test_handler/test_handler_seed_random.py	2014-07-08 04:39:36 +0000
@@ -22,7 +22,7 @@
 import gzip
 import tempfile
 
-from StringIO import StringIO
+from six import StringIO
 
 from cloudinit import cloud
 from cloudinit import distros
 
=== modified file 'tests/unittests/test_handler/test_handler_set_hostname.py'
--- tests/unittests/test_handler/test_handler_set_hostname.py	2013-06-25 06:57:27 +0000
+++ tests/unittests/test_handler/test_handler_set_hostname.py	2014-07-08 04:39:36 +0000
@@ -9,7 +9,7 @@
 
 import logging
 
-from StringIO import StringIO
+from six import BytesIO
 
 from configobj import ConfigObj
 
@@ -37,8 +37,8 @@
         self.patchUtils(self.tmp)
         cc_set_hostname.handle('cc_set_hostname',
                                cfg, cc, LOG, [])
-        contents = util.load_file("/etc/sysconfig/network")
-        n_cfg = ConfigObj(StringIO(contents))
+        contents = util.load_file("/etc/sysconfig/network", decode=False)
+        n_cfg = ConfigObj(BytesIO(contents))
         self.assertEquals({'HOSTNAME': 'blah.blah.blah.yahoo.com'},
                           dict(n_cfg))
 
 
=== modified file 'tests/unittests/test_handler/test_handler_timezone.py'
--- tests/unittests/test_handler/test_handler_timezone.py	2013-06-25 06:57:27 +0000
+++ tests/unittests/test_handler/test_handler_timezone.py	2014-07-08 04:39:36 +0000
@@ -29,7 +29,7 @@
 
 from configobj import ConfigObj
 
-from StringIO import StringIO
+from six import BytesIO
 
 import logging
 
@@ -67,8 +67,8 @@
 
         cc_timezone.handle('cc_timezone', cfg, cc, LOG, [])
 
-        contents = util.load_file('/etc/sysconfig/clock')
-        n_cfg = ConfigObj(StringIO(contents))
+        contents = util.load_file('/etc/sysconfig/clock', decode=False)
+        n_cfg = ConfigObj(BytesIO(contents))
         self.assertEquals({'TIMEZONE': cfg['timezone']}, dict(n_cfg))
 
         contents = util.load_file('/etc/localtime')
 
=== modified file 'tests/unittests/test_handler/test_handler_yum_add_repo.py'
--- tests/unittests/test_handler/test_handler_yum_add_repo.py	2014-04-01 18:20:57 +0000
+++ tests/unittests/test_handler/test_handler_yum_add_repo.py	2014-07-08 04:39:36 +0000
@@ -6,7 +6,7 @@
 
 import logging
 
-from StringIO import StringIO
+from six import BytesIO
 
 import configobj
 
@@ -52,8 +52,9 @@
         }
         self.patchUtils(self.tmp)
         cc_yum_add_repo.handle('yum_add_repo', cfg, None, LOG, [])
-        contents = util.load_file("/etc/yum.repos.d/epel_testing.repo")
-        contents = configobj.ConfigObj(StringIO(contents))
+        contents = util.load_file("/etc/yum.repos.d/epel_testing.repo",
+                                  decode=False)
+        contents = configobj.ConfigObj(BytesIO(contents))
         expected = {
             'epel_testing': {
                 'name': 'Extra Packages for Enterprise Linux 5 - Testing',