Merge lp:~hazmat/pyjuju/fast-yaml into lp:pyjuju

[Kapil Thangavelu]

ensure use of py yaml c extension for speed.

Backwards compatible. Drops test time in half. Should improve speed
across the board, things like status will see marked improvements.

https://codereview.appspot.com/6493100/

[Kapil Thangavelu (hazmat)]

Reviewers: mp+123470_code.launchpad.net,

Message:
Please take a look.

Description:
ensure use of py yaml c extension for speed.

Backwards compatible. Drops test time in half. Should improve speed
across the board, things like status will see marked improvements.

https://code.launchpad.net/~hazmat/juju/fast-yaml/+merge/123470

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/6493100/

Affected files:
   A [revision details]
   M juju/agents/tests/test_unit.py
   M juju/charm/config.py
   M juju/charm/metadata.py
   M juju/charm/tests/test_base.py
   M juju/charm/tests/test_bundle.py
   M juju/charm/tests/test_config.py
   M juju/charm/tests/test_directory.py
   M juju/charm/tests/test_metadata.py
   M juju/charm/tests/test_publisher.py
   M juju/control/config_set.py
   M juju/control/constraints_get.py
   M juju/control/deploy.py
   M juju/control/initialize.py
   M juju/control/status.py
   M juju/control/tests/test_add_unit.py
   M juju/control/tests/test_bootstrap.py
   M juju/control/tests/test_config_get.py
   M juju/control/tests/test_config_set.py
   M juju/control/tests/test_constraints_get.py
   M juju/control/tests/test_deploy.py
   M juju/control/tests/test_destroy_environment.py
   M juju/control/tests/test_expose.py
   M juju/control/tests/test_initialize.py
   M juju/control/tests/test_open_tunnel.py
   M juju/control/tests/test_remove_relation.py
   M juju/control/tests/test_scp.py
   M juju/control/tests/test_status.py
   M juju/control/tests/test_unexpose.py
   M juju/control/tests/test_upgrade_charm.py
   M juju/control/tests/test_utils.py
   M juju/environment/config.py
   M juju/environment/tests/test_config.py
   M juju/hooks/protocol.py
   M juju/hooks/scheduler.py
   M juju/hooks/tests/test_cli.py
   M juju/hooks/tests/test_invoker.py
   M juju/hooks/tests/test_scheduler.py
   M juju/lib/format.py
   A juju/lib/serializer.py
   M juju/providers/common/cloudinit.py
   M juju/providers/common/state.py
   M juju/providers/common/tests/test_cloudinit.py
   M juju/providers/common/tests/test_findzookeepers.py
   M juju/providers/common/tests/test_state.py
   M juju/providers/common/tests/test_utils.py
   M juju/providers/common/utils.py
   M juju/providers/ec2/tests/common.py
   M juju/providers/ec2/tests/test_bootstrap.py
   M juju/providers/ec2/tests/test_findzookeeper.py
   M juju/providers/ec2/tests/test_launch.py
   M juju/providers/ec2/tests/test_provider.py
   M juju/providers/ec2/tests/test_state.py
   M juju/providers/local/files.py
   M juju/providers/local/tests/test_agent.py
   M juju/providers/local/tests/test_container.py
   M juju/providers/local/tests/test_files.py
   M juju/providers/openstack/tests/test_bootstrap.py
   M juju/providers/openstack/tests/test_launch.py
   M juju/providers/openstack/tests/test_state.py
   M juju/providers/orchestra/tests/common.py
   M juju/providers/orchestra/tests/test_bootstrap.py
   M juju/providers/orchestra/tests/test_findzookeepers.py
   M juju/providers/orchestra/tests/test_state.py
   M juju/state/charm.py
   M juju/state/environment.py
   M juju/state/hook.py
   M juju/state/machine.py
   M juju/state/relation....

[Martin Packman (gz)]

Looks like a good improvement, I like that this also sorts out the
confusion over whether to use dump/load or safe_dump/safe_load at the
same time.

I would have been tempted to name the wrapper module juju.lib.yaml to
avoid touching most lines, but this way means you did look at all the
callers at least.

There are several callsites that still use the yaml module functions and
pass in a Loader or Dumper, apart from the one noted below, shouldn't
they all be changed to using juju.lib for consistency?

https://codereview.appspot.com/6493100/diff/1/juju/charm/config.py
File juju/charm/config.py (right):

https://codereview.appspot.com/6493100/diff/1/juju/charm/config.py#newcode80
juju/charm/config.py:80: raw_data = yaml.load(data,
Loader=yaml.CSafeLoader)
Why not use dump from juju.lib here rather than specifying the loader?
Will need the yaml import for the Mark below anyway, but seems best to
consistently use the same loader.

https://codereview.appspot.com/6493100/diff/1/juju/control/constraints_get.py
File juju/control/constraints_get.py (right):

https://codereview.appspot.com/6493100/diff/1/juju/control/constraints_get.py#newcode73
juju/control/constraints_get.py:73: yaml.dump(result, sys.stdout,
Dumper=yaml.CSafeDumper)
I'd dump using the juju.lib function and write to stout separately
afterwards here.

https://codereview.appspot.com/6493100/diff/1/juju/control/status.py
File juju/control/status.py (right):

https://codereview.appspot.com/6493100/diff/1/juju/control/status.py#newcode581
juju/control/status.py:581: data, filelike, default_flow_style=False,
Dumper=yaml.CSafeDumper)
This looks like the only place that really wants extra args to dump,
leaving this as a special case seems fine.

https://codereview.appspot.com/6493100/diff/1/juju/lib/serializer.py
File juju/lib/serializer.py (right):

https://codereview.appspot.com/6493100/diff/1/juju/lib/serializer.py#newcode5
juju/lib/serializer.py:5: def dump(*args, **kw):
I'd be tempted to make this just take a dict rather than passing through
args and kwargs.

https://codereview.appspot.com/6493100/diff/1/juju/lib/serializer.py#newcode9
juju/lib/serializer.py:9: def load(*args, **kw):
Likewise, would make this just take a string.

https://codereview.appspot.com/6493100/

[lp:~hazmat/pyjuju/fast-yaml]

576. By Kapil Thangavelu on 2012-09-14

explicit yaml dump/load in serializer, and yaml_mark_with_path utility method, switch out juju/charm & juju/control to use

[Kapil Thangavelu (hazmat)]

Please take a look.

https://codereview.appspot.com/6493100/

[Jim Baker (jimbaker)]

+1, LGTM, nice speedup and a clean transition to the C extensions. Just
need to take care of the two trivials where CSafeLoader/CSafeDumper is
used instead of the equivalent juju.lib.serializer wrappers.

https://codereview.appspot.com/6493100/diff/5002/juju/environment/config.py
File juju/environment/config.py (right):

https://codereview.appspot.com/6493100/diff/5002/juju/environment/config.py#newcode178
juju/environment/config.py:178: config = yaml.load(content,
Loader=yaml.CSafeLoader)
Use juju.lib.serializer.load instead

https://codereview.appspot.com/6493100/diff/5002/juju/environment/config.py#newcode313
juju/environment/config.py:313: return yaml.dump(config,
Dumper=yaml.CSafeDumper)
Use juju.lib.serializer.dump instead

https://codereview.appspot.com/6493100/

[lp:~hazmat/pyjuju/fast-yaml]

577. By Kapil Thangavelu on 2012-09-15

switch out juju/env pkg to use serializer for yaml dump/load

578. By Kapil Thangavelu on 2012-09-15

merge trunk and resolve conflicts

579. By Kapil Thangavelu on 2012-09-15

address some comments from martin's review (sys.stdout.write, use contextmanager for files)

580. By Kapil Thangavelu on 2012-09-15

kill useless topo migration, fix some laggards wrt to dump/load future format change isomorphism

=== modified file 'juju/agents/tests/test_unit.py'
--- juju/agents/tests/test_unit.py	2012-03-28 18:57:58 +0000
+++ juju/agents/tests/test_unit.py	2012-09-15 19:26:18 +0000
@@ -1,7 +1,6 @@
 import argparse
 import logging
 import os
-import yaml
 
 from twisted.internet.defer import inlineCallbacks, returnValue
 
@@ -10,6 +9,7 @@
 from juju.charm import get_charm_from_path
 from juju.charm.url import CharmURL
 from juju.errors import JujuError
+from juju.lib import serializer
 from juju.state.environment import GlobalSettingsStateManager
 from juju.state.errors import ServiceStateNotFound
 from juju.state.service import NO_HOOKS, RETRY_HOOKS
@@ -375,7 +375,7 @@
         self.assertEqual(
             {"greeting": "hello", "planet": "earth",
              "private-address": "mysql-0.example.com"},
-            yaml.load(contents))
+            serializer.load(contents))
 
         self.failUnlessIn("wordpress/0", output)
 

=== modified file 'juju/charm/config.py'
--- juju/charm/config.py	2012-08-30 03:06:56 +0000
+++ juju/charm/config.py	2012-09-15 19:26:18 +0000
@@ -1,9 +1,9 @@
 import copy
 import os
 import sys
-
 import yaml
 
+from juju.lib import serializer
 from juju.lib.format import YAMLFormat
 from juju.lib.schema import (SchemaError, KeyDict, Dict, String,
                                  Constant, OneOf, Int, Float)
@@ -78,11 +78,12 @@
         """
         if isinstance(data, basestring):
             try:
-                raw_data = yaml.load(data)
+                raw_data = serializer.yaml_load(data)
             except yaml.MarkedYAMLError, e:
                 # Capture the path name on the error if present.
                 if pathname is not None:
-                    e.problem_mark.name = pathname
+                    e.problem_mark = serializer.yaml_mark_with_path(
+                        pathname, e.problem_mark)
                 raise
         elif isinstance(data, dict):
             raw_data = data

=== modified file 'juju/charm/metadata.py'
--- juju/charm/metadata.py	2012-06-14 17:51:48 +0000
+++ juju/charm/metadata.py	2012-09-15 19:26:18 +0000
@@ -5,6 +5,7 @@
 
 from juju.charm.errors import MetaDataError
 from juju.errors import FileNotFound
+from juju.lib import serializer
 from juju.lib.format import is_valid_charm_format
 from juju.lib.schema import (
     SchemaError, Bool, Constant, Dict, Int,
@@ -200,11 +201,13 @@
         @raise MetaDataError: When errors are found in the info data.
         """
         try:
-            self.parse_serialization_data(yaml.load(content), path)
+            self.parse_serialization_data(
+                serializer.yaml_load(content), path)
         except yaml.MarkedYAMLError, e:
             # Capture the path name on the error if present.
             if path is not None:
-                e.problem_mark.name = path
+                e.problem_mark = serializer.yaml_mark_with_path(
+                    path, e.problem_mark)
             raise
 
         if "revision" in self._data and path:

=== modified file 'juju/charm/tests/test_base.py'
--- juju/charm/tests/test_base.py	2011-10-05 19:12:34 +0000
+++ juju/charm/tests/test_base.py	2012-09-15 19:26:18 +0000
@@ -1,8 +1,7 @@
-import yaml
-
 from juju.charm.base import CharmBase, get_revision
 from juju.charm.metadata import MetaData
 from juju.errors import CharmError
+from juju.lib import serializer
 from juju.lib.testing import TestCase
 
 
@@ -73,6 +72,9 @@
     def test_metadata_fallback(self):
         metadata = MetaData()
         self.assertEquals(get_revision(None, metadata, None), None)
-        metadata.parse(yaml.dump({
-            "name": "x", "summary": "y", "description": "z","revision": 33}))
+        metadata.parse(
+            serializer.yaml_dump(
+                {"name": "x", "summary": "y", "description": "z","revision": 33},
+                ))
+
         self.assertEquals(get_revision(None, metadata, None), 33)

=== modified file 'juju/charm/tests/test_bundle.py'
--- juju/charm/tests/test_bundle.py	2012-04-04 11:26:08 +0000
+++ juju/charm/tests/test_bundle.py	2012-09-15 19:26:18 +0000
@@ -3,9 +3,9 @@
 import inspect
 import shutil
 import stat
-import yaml
 import zipfile
 
+from juju.lib import serializer
 from juju.lib.testing import TestCase
 from juju.lib.filehash import compute_file_hash
 from juju.charm.metadata import MetaData
@@ -84,9 +84,9 @@
                 continue
             content = zf_src.read(name)
             if name == "metadata.yaml":
-                data = yaml.load(content)
+                data = serializer.yaml_load(content)
                 data["revision"] = 303
-                content = yaml.dump(data)
+                content = serializer.yaml_dump(data)
             zf_dst.writestr(name, content)
         zf_src.close()
         zf_dst.close()
@@ -97,9 +97,9 @@
     def test_competing_revisions(self):
         zf = zipfile.ZipFile(self.filename, "a")
         zf.writestr("revision", "999")
-        data = yaml.load(zf.read("metadata.yaml"))
+        data = serializer.yaml_load(zf.read("metadata.yaml"))
         data["revision"] = 303
-        zf.writestr("metadata.yaml", yaml.dump(data))
+        zf.writestr("metadata.yaml", serializer.yaml_dump(data))
         zf.close()
 
         charm = CharmBundle(self.filename)

=== modified file 'juju/charm/tests/test_config.py'
--- juju/charm/tests/test_config.py	2012-07-02 08:48:19 +0000
+++ juju/charm/tests/test_config.py	2012-09-15 19:26:18 +0000
@@ -3,6 +3,7 @@
 
 import yaml
 
+from juju.lib import serializer
 from juju.lib.testing import TestCase
 from juju.charm.config import ConfigOptions
 from juju.charm.errors import ServiceConfigError, ServiceConfigValueError
@@ -25,7 +26,7 @@
     type: int
 """
 
-sample_yaml_data = yaml.load(sample_configuration)
+sample_yaml_data = serializer.yaml_load(sample_configuration)
 
 sample_config_defaults = {"title": "My Title",
                           "username": "admin001"}
@@ -82,7 +83,7 @@
         e = self.assertRaises(
             ServiceConfigValueError,
             self.config.parse,
-            yaml.dump(
+            serializer.yaml_dump(
                 {"options": {
                     "foobar": {
                         "description": "beyond what?",
@@ -98,8 +99,9 @@
 
         # Verify dictionary serialization
         schema_dict = self.config.as_dict()
-        self.assertEqual(schema_dict,
-                         yaml.load(sample_configuration)["options"])
+        self.assertEqual(
+            schema_dict,
+            serializer.yaml_load(sample_configuration)["options"])
 
         # Verify the dictionary is a copy
         # Poke at embedded objects
@@ -143,7 +145,7 @@
             ServiceConfigValueError, config.validate, sample_input)
 
     def test_validate_float(self):
-        self.config.parse(yaml.dump(
+        self.config.parse(serializer.yaml_dump(
             {"options": {
                 "score": {
                     "description": "A number indicating score.",
@@ -166,7 +168,7 @@
         self.assertEqual(data, {"title": u"Good"})
 
     def test_validate_boolean(self):
-        self.config.parse(yaml.dump(
+        self.config.parse(serializer.yaml_dump(
             {"options": {
                 "active": {
                     "description": "A boolean indicating activity.",
@@ -200,9 +202,9 @@
         'string' now). Remove support for it after a while, and take
         this test with it.
         """
-        config = yaml.load(sample_configuration)
+        config = serializer.yaml_load(sample_configuration)
         config["options"]["title"]["type"] = "str"
-        obsolete_config = yaml.dump(config)
+        obsolete_config = serializer.yaml_dump(config)
 
         sio = StringIO()
         self.patch(sys, "stderr", sio)

=== modified file 'juju/charm/tests/test_directory.py'
--- juju/charm/tests/test_directory.py	2012-03-08 02:50:43 +0000
+++ juju/charm/tests/test_directory.py	2012-09-15 19:26:18 +0000
@@ -4,7 +4,6 @@
 import inspect
 import shutil
 import tempfile
-import yaml
 import zipfile
 
 from juju.errors import CharmError, FileNotFound
@@ -12,6 +11,7 @@
 from juju.charm.metadata import MetaData
 from juju.charm.directory import CharmDirectory
 from juju.charm.bundle import CharmBundle
+from juju.lib import serializer
 from juju.lib.filehash import compute_file_hash
 from juju.charm import tests
 
@@ -46,10 +46,10 @@
     def set_metadata_revision(self, dir_, revision):
         metadata_path = os.path.join(dir_, "metadata.yaml")
         with open(metadata_path) as f:
-            data = yaml.load(f.read())
+            data = serializer.yaml_load(f.read())
         data["revision"] = 999
         with open(metadata_path, "w") as f:
-            f.write(yaml.dump(data))
+            f.write(serializer.yaml_dump(data))
 
     def test_metadata_is_required(self):
         directory = self.makeDir()

=== modified file 'juju/charm/tests/test_metadata.py'
--- juju/charm/tests/test_metadata.py	2012-05-25 22:43:52 +0000
+++ juju/charm/tests/test_metadata.py	2012-09-15 19:26:18 +0000
@@ -9,6 +9,7 @@
     MetaData, MetaDataError, InterfaceExpander, SchemaError)
 from juju.errors import FileNotFound
 from juju.lib.testing import TestCase
+from juju.lib import serializer
 
 test_repository_path = os.path.join(
     os.path.dirname(inspect.getabsfile(tests)),
@@ -39,11 +40,11 @@
         class HackManager(object):
 
             def __enter__(mgr):
-                mgr.data = yaml.load(self.sample)
+                mgr.data = serializer.yaml_load(self.sample)
                 return mgr.data
 
             def __exit__(mgr, exc_type, exc_val, exc_tb):
-                self.sample = yaml.dump(mgr.data)
+                self.sample = serializer.yaml_dump(mgr.data)
                 return False
         return HackManager()
 
@@ -145,7 +146,7 @@
         others.
         """
         serialization_data = {"Hi": "there!"}
-        yaml_data = yaml.dump(serialization_data)
+        yaml_data = serializer.yaml_dump(serialization_data)
         path = self.makeFile(yaml_data)
         mock = self.mocker.patch(self.metadata)
         mock.parse(yaml_data, path)

=== modified file 'juju/charm/tests/test_publisher.py'
--- juju/charm/tests/test_publisher.py	2012-04-06 16:35:31 +0000
+++ juju/charm/tests/test_publisher.py	2012-09-15 19:26:18 +0000
@@ -1,6 +1,5 @@
 import fcntl
 import os
-import yaml
 import zookeeper
 
 from twisted.internet.defer import inlineCallbacks, fail
@@ -12,7 +11,7 @@
 from juju.charm.directory import CharmDirectory
 from juju.charm.publisher import CharmPublisher
 from juju.charm.tests import local_charm_id
-from juju.lib import under
+from juju.lib import under, serializer
 from juju.providers.dummy import FileStorage
 from juju.state.charm import CharmStateManager
 from juju.state.errors import StateChanged
@@ -140,7 +139,8 @@
 
         # assert the checksum matches the initially published checksum
         self.assertEqual(
-            yaml.load(content)["sha256"], self.charm.get_sha256())
+            serializer.yaml_load(content)["sha256"],
+            self.charm.get_sha256())
 
         store_path = os.path.join(self.storage_dir, self.charm_storage_key)
         self.assertTrue(os.path.exists(store_path))

=== modified file 'juju/control/config_set.py'
--- juju/control/config_set.py	2012-07-02 23:55:27 +0000
+++ juju/control/config_set.py	2012-09-15 19:26:18 +0000
@@ -1,11 +1,11 @@
 import argparse
-
 import yaml
 
 from twisted.internet.defer import inlineCallbacks
 
 from juju.charm.errors import ServiceConfigValueError
 from juju.control.utils import get_environment
+from juju.lib import serializer
 from juju.lib.format import get_charm_formatter
 from juju.state.service import ServiceStateManager
 
@@ -62,7 +62,7 @@
 
         yaml_data = options.config.read()
         try:
-            data = yaml.safe_load(yaml_data)
+            data = serializer.yaml_load(yaml_data)
         except yaml.YAMLError:
             raise ServiceConfigValueError(
                 "Config file %r not valid YAML" % options.config.name)

=== modified file 'juju/control/constraints_get.py'
--- juju/control/constraints_get.py	2012-03-30 09:41:54 +0000
+++ juju/control/constraints_get.py	2012-09-15 19:26:18 +0000
@@ -1,10 +1,10 @@
 import argparse
 import sys
-import yaml
 
 from twisted.internet.defer import inlineCallbacks
 
 from juju.control.utils import get_environment, sync_environment_state
+from juju.lib import serializer
 from juju.state.environment import EnvironmentStateManager
 from juju.state.machine import MachineStateManager
 from juju.state.service import ServiceStateManager
@@ -70,6 +70,7 @@
             log.info("Fetching constraints for environment")
             constraints = yield esm.get_constraints()
             result = dict(constraints)
-        yaml.safe_dump(result, sys.stdout)
+        contents = serializer.yaml_dump(result)
+        sys.stdout.write(contents)
     finally:
         yield client.close()

=== modified file 'juju/control/deploy.py'
--- juju/control/deploy.py	2012-04-01 00:48:01 +0000
+++ juju/control/deploy.py	2012-09-15 19:26:18 +0000
@@ -1,7 +1,5 @@
 import os
 
-import yaml
-
 from twisted.internet.defer import inlineCallbacks
 
 from juju.control import legacy
@@ -12,6 +10,7 @@
 from juju.charm.publisher import CharmPublisher
 from juju.charm.repository import resolve
 from juju.errors import CharmError
+from juju.lib import serializer
 from juju.state.endpoint import RelationEndpoint
 from juju.state.placement import place_unit
 from juju.state.relation import RelationStateManager
@@ -85,7 +84,9 @@
         raise ServiceConfigValueError(
             "Config file %r not accessible." % config_file)
 
-    options = yaml.load(open(config_file, "r").read())
+    with open(config_file) as fh:
+        options = serializer.yaml_load(fh.read())
+
     if not options or not isinstance(options, dict) or \
             service_name not in options:
         raise ServiceConfigValueError(

=== modified file 'juju/control/initialize.py'
--- juju/control/initialize.py	2012-03-29 01:37:57 +0000
+++ juju/control/initialize.py	2012-09-15 19:26:18 +0000
@@ -1,11 +1,11 @@
 from base64 import b64decode
 import os
-import yaml
 
 from twisted.internet.defer import inlineCallbacks
 
 from txzookeeper import ZookeeperClient
 
+from juju.lib import serializer
 from juju.state.initialize import StateHierarchy
 
 
@@ -34,7 +34,7 @@
     zk_address = os.environ.get("ZOOKEEPER_ADDRESS", "127.0.0.1:2181")
     client = yield ZookeeperClient(zk_address).connect()
     try:
-        constraints_data = yaml.load(b64decode(options.constraints_data))
+        constraints_data = serializer.load(b64decode(options.constraints_data))
         hierarchy = StateHierarchy(
             client,
             options.admin_identity,

=== modified file 'juju/control/status.py'
--- juju/control/status.py	2012-08-05 00:18:28 +0000
+++ juju/control/status.py	2012-09-15 19:26:18 +0000
@@ -3,12 +3,13 @@
 import functools
 import json
 import sys
+import yaml
 
 from twisted.internet.defer import inlineCallbacks, returnValue
-import yaml
 
 from juju.control.utils import get_environment
 from juju.errors import ProviderError
+
 from juju.state.errors import UnitRelationStateNotFound
 from juju.state.charm import CharmStateManager
 from juju.state.machine import MachineStateManager
@@ -576,7 +577,8 @@
 
 def render_yaml(data, filelike, environment):
     # remove the root nodes empty name
-    yaml.safe_dump(data, filelike, default_flow_style=False)
+    yaml.dump(
+        data, filelike, default_flow_style=False, Dumper=yaml.CSafeDumper)
 
 renderers["yaml"] = render_yaml
 

=== modified file 'juju/control/tests/test_add_unit.py'
--- juju/control/tests/test_add_unit.py	2012-05-04 22:43:40 +0000
+++ juju/control/tests/test_add_unit.py	2012-09-15 19:26:18 +0000
@@ -1,8 +1,7 @@
-from yaml import dump
-
 from twisted.internet.defer import inlineCallbacks
 
 from juju.control import main
+from juju.lib.serializer import yaml_dump
 from juju.state.environment import EnvironmentStateManager
 
 from .common import MachineControlToolTest
@@ -184,7 +183,7 @@
             "environments": {"firstenv": {
                     "some-legacy-key": "blah",
                     "type": "dummy"}}}
-        self.write_config(dump(local_config))
+        self.write_config(yaml_dump(local_config))
         self.config.load()
 
         finished = self.setup_cli_reactor()

=== modified file 'juju/control/tests/test_bootstrap.py'
--- juju/control/tests/test_bootstrap.py	2012-05-04 22:43:40 +0000
+++ juju/control/tests/test_bootstrap.py	2012-09-15 19:26:18 +0000
@@ -1,9 +1,9 @@
 
 from twisted.internet.defer import inlineCallbacks, succeed
-from yaml import dump
 
+from juju.control import main
+from juju.lib.serializer import yaml_dump as dump
 from juju.providers.dummy import MachineProvider
-from juju.control import main
 
 from .common import ControlToolTest
 

=== modified file 'juju/control/tests/test_config_get.py'
--- juju/control/tests/test_config_get.py	2012-09-13 18:31:19 +0000
+++ juju/control/tests/test_config_get.py	2012-09-15 19:26:18 +0000
@@ -1,10 +1,8 @@
-import yaml
-
 from twisted.internet.defer import inlineCallbacks
 
 from juju.control import main
-
 from juju.charm.tests import local_charm_id
+from juju.lib import serializer
 from .common import MachineControlToolTest
 
 
@@ -32,7 +30,7 @@
         main(["get", "wordpress"])
 
         yield finished
-        data = yaml.load(output.getvalue())
+        data = serializer.yaml_load(output.getvalue())
         self.assertEqual(
             {"service": "wordpress",
              "charm": "local:series/wordpress-3",
@@ -59,7 +57,7 @@
         main(["get", "dummy"])
 
         yield finished
-        data = yaml.load(output.getvalue())
+        data = serializer.yaml_load(output.getvalue())
 
         self.assertEqual(
             {"service": "dummy",

=== modified file 'juju/control/tests/test_config_set.py'
--- juju/control/tests/test_config_set.py	2012-08-30 03:06:56 +0000
+++ juju/control/tests/test_config_set.py	2012-09-15 19:26:18 +0000
@@ -1,9 +1,8 @@
-from yaml import dump
-
 from twisted.internet.defer import inlineCallbacks
 
 from juju.control import main
 from juju.control.config_set import config_set
+from juju.lib import serializer
 from .common import MachineControlToolTest
 
 
@@ -38,8 +37,8 @@
         finished = self.setup_cli_reactor()
         self.setup_exit(0)
         self.mocker.replay()
-        config_file = self.makeFile(dump(dict(
-            wordpress={"blog-title": "Hello World"})))
+        config_file = self.makeFile(serializer.yaml_dump(
+            dict(wordpress={"blog-title": "Hello World"})))
 
         main(["set", "wordpress",
               "--config=%s" % config_file])
@@ -54,13 +53,13 @@
         finished = self.setup_cli_reactor()
         self.setup_exit(0)
         self.mocker.replay()
+
         # missing the service_name dict (will do nothing to values)
-        config_file = self.makeFile(dump({"blog-title": "Hello World"}))
-
-        main(["set", "wordpress",
-              "--config=%s" % config_file])
-
+        config_file = self.makeFile(
+            serializer.yaml_dump({"blog-title": "Hello World"}))
+        main(["set", "wordpress", "--config=%s" % config_file])
         yield finished
+
         state = yield self.service_state.get_config()
         self.assertEqual(state, {'blog-title': 'My Title'})
 
@@ -90,7 +89,7 @@
         self.mocker.replay()
 
         # valid file, but incorrect cli usage
-        config_file = self.makeFile(dump(dict(
+        config_file = self.makeFile(serializer.yaml_dump(dict(
             wordpress={"blog-title": "Hello World"})))
 
         main(["-v", "set", "wordpress",

=== modified file 'juju/control/tests/test_constraints_get.py'
--- juju/control/tests/test_constraints_get.py	2012-03-30 09:41:54 +0000
+++ juju/control/tests/test_constraints_get.py	2012-09-15 19:26:18 +0000
@@ -1,8 +1,7 @@
-import yaml
-
 from twisted.internet.defer import inlineCallbacks
 
 from juju.control import main
+from juju.lib import serializer
 from juju.machine.tests.test_constraints import dummy_cs
 from juju.state.environment import EnvironmentStateManager
 
@@ -65,7 +64,7 @@
     def test_env(self):
         main(["get-constraints"])
         yield self.finished
-        result = yaml.load(self.stdout.getvalue())
+        result = serializer.load(self.stdout.getvalue())
         self.assertEquals(result, self.expect_env)
         self.assert_messages(env_log)
 
@@ -73,7 +72,7 @@
     def test_service(self):
         main(["get-constraints", "mysql"])
         yield self.finished
-        result = yaml.load(self.stdout.getvalue())
+        result = serializer.load(self.stdout.getvalue())
         self.assertEquals(result, {"mysql": self.expect_service})
         self.assert_messages(service_log)
 
@@ -81,7 +80,7 @@
     def test_unit(self):
         main(["get-constraints", "mysql/0"])
         yield self.finished
-        result = yaml.load(self.stdout.getvalue())
+        result = serializer.load(self.stdout.getvalue())
         self.assertEquals(result, {"mysql/0": self.expect_unit})
         self.assert_messages(unit_log)
 
@@ -89,7 +88,7 @@
     def test_machine(self):
         main(["get-constraints", "1"])
         yield self.finished
-        result = yaml.load(self.stdout.getvalue())
+        result = serializer.load(self.stdout.getvalue())
         self.assertEquals(result, {"1": self.expect_machine})
         self.assert_messages(machine_log)
 
@@ -97,7 +96,7 @@
     def test_all(self):
         main(["get-constraints", "mysql", "mysql/0", "1"])
         yield self.finished
-        result = yaml.load(self.stdout.getvalue())
+        result = serializer.load(self.stdout.getvalue())
         expect = {"mysql": self.expect_service,
                   "mysql/0": self.expect_unit,
                   "1": self.expect_machine}
@@ -111,6 +110,6 @@
         yield self.client.delete("/environment")
         main(["get-constraints", "mysql/0"])
         yield self.finished
-        result = yaml.load(self.stdout.getvalue())
+        result = serializer.load(self.stdout.getvalue())
         self.assertEquals(result, {"mysql/0": self.expect_unit})
         self.assert_messages(unit_log)

=== modified file 'juju/control/tests/test_deploy.py'
--- juju/control/tests/test_deploy.py	2012-05-04 22:43:40 +0000
+++ juju/control/tests/test_deploy.py	2012-09-15 19:26:18 +0000
@@ -1,7 +1,5 @@
 import logging
 import os
-import yaml
-
 
 from twisted.internet.defer import inlineCallbacks, succeed
 
@@ -15,6 +13,7 @@
 from juju.charm.repository import RemoteCharmRepository
 from juju.charm.url import CharmURL
 from juju.charm.errors import ServiceConfigValueError
+from juju.lib import serializer
 
 from juju.state.charm import CharmStateManager
 from juju.state.environment import EnvironmentStateManager
@@ -58,7 +57,7 @@
                 "secondenv": {
                     "type": "dummy", "admin-secret": "marge"}}}
 
-        self.write_config(yaml.dump(config))
+        self.write_config(serializer.dump(config))
         stderr = self.capture_logging()
         main(["deploy", "--repository", self.unbundled_repo_path, "mysql"])
         self.assertIn("There are multiple environments", stderr.getvalue())
@@ -167,7 +166,7 @@
                 "secondenv": {
                     "type": "dummy", "admin-secret": "marge"}}}
 
-        self.write_config(yaml.dump(config))
+        self.write_config(serializer.dump(config))
 
         stderr = self.capture_logging()
         main(["deploy", "--environment", "roman-candle",
@@ -186,7 +185,7 @@
                 "secondenv": {
                     "type": "dummy", "admin-secret": "marge"}}}
 
-        self.write_config(yaml.dump(config))
+        self.write_config(serializer.dump(config))
 
         def match_config(config):
             return isinstance(config, EnvironmentsConfig)
@@ -353,8 +352,8 @@
         env_state_manager = EnvironmentStateManager(self.client)
         env_config = yield env_state_manager.get_config()
 
-        self.assertEquals(yaml.load(env_config.serialize("firstenv")),
-                          yaml.load(self.config.serialize("firstenv")))
+        self.assertEquals(serializer.load(env_config.serialize("firstenv")),
+                          serializer.load(self.config.serialize("firstenv")))
 
     @inlineCallbacks
     def test_deploy_reuses_machines(self):
@@ -394,7 +393,7 @@
         """Valid config options should be available to the deployed
         service."""
         config_file = self.makeFile(
-            yaml.dump(dict(otherservice=dict(application_file="foo"))))
+            serializer.dump(dict(otherservice=dict(application_file="foo"))))
         environment = self.config.get("firstenv")
 
         failure = deploy.deploy(
@@ -408,7 +407,7 @@
     def test_deploy_with_invalid_config(self):
         """Can't deploy with config that doesn't pass charm validation."""
         config_file = self.makeFile(
-            yaml.dump(dict(myblog=dict(application_file="foo"))))
+            serializer.dump(dict(myblog=dict(application_file="foo"))))
         environment = self.config.get("firstenv")
 
         failure = deploy.deploy(
@@ -426,7 +425,7 @@
     def test_deploy_with_config(self):
         """Valid config options should be available to the deployed
         service."""
-        config_file = self.makeFile(yaml.dump(dict(
+        config_file = self.makeFile(serializer.dump(dict(
                     myblog=dict(outlook="sunny",
                                 username="tester01"))))
         environment = self.config.get("firstenv")
@@ -555,7 +554,7 @@
                     "type": "dummy",
                     "some-legacy-key": "blah",
                     "default-series": "series"}}}
-        self.write_config(yaml.dump(local_config))
+        self.write_config(serializer.dump(local_config))
         self.config.load()
         finished = self.setup_cli_reactor()
         self.setup_exit(0)

=== modified file 'juju/control/tests/test_destroy_environment.py'
--- juju/control/tests/test_destroy_environment.py	2012-05-04 22:43:40 +0000
+++ juju/control/tests/test_destroy_environment.py	2012-09-15 19:26:18 +0000
@@ -1,6 +1,6 @@
 from twisted.internet.defer import succeed, inlineCallbacks
-from yaml import dump
 
+from juju.lib.serializer import dump
 from juju.lib.mocker import MATCH
 from juju.providers.dummy import MachineProvider
 from juju.control import main

=== modified file 'juju/control/tests/test_expose.py'
--- juju/control/tests/test_expose.py	2012-05-04 22:43:40 +0000
+++ juju/control/tests/test_expose.py	2012-09-15 19:26:18 +0000
@@ -1,8 +1,8 @@
-import yaml
 from twisted.internet.defer import inlineCallbacks
 
 from juju.control import main
 from juju.control.tests.common import ControlToolTest
+from juju.lib import serializer
 from juju.state.tests.test_service import ServiceStateManagerTestBase
 
 
@@ -15,7 +15,7 @@
         config = {
             "environments": {"firstenv": {"type": "dummy"}}}
 
-        self.write_config(yaml.dump(config))
+        self.write_config(serializer.dump(config))
         self.config.load()
         self.service_state = yield self.add_service_from_charm("wordpress")
         self.output = self.capture_logging()

=== modified file 'juju/control/tests/test_initialize.py'
--- juju/control/tests/test_initialize.py	2012-03-30 09:12:11 +0000
+++ juju/control/tests/test_initialize.py	2012-09-15 19:26:18 +0000
@@ -1,11 +1,11 @@
 from base64 import b64encode
-from yaml import safe_dump
+
 
 from twisted.internet.defer import succeed
 
 from txzookeeper import ZookeeperClient
 from juju.state.initialize import StateHierarchy
-
+from juju.lib.serializer import dump
 from juju.control import admin
 from .common import ControlToolTest
 
@@ -29,7 +29,7 @@
         self.setup_exit(0)
         self.mocker.replay()
 
-        constraints_data = b64encode(safe_dump({
+        constraints_data = b64encode(dump({
             "ubuntu-series": "foo", "provider-type": "bar"}))
 
         admin(["initialize",

=== modified file 'juju/control/tests/test_open_tunnel.py'
--- juju/control/tests/test_open_tunnel.py	2011-09-15 19:24:47 +0000
+++ juju/control/tests/test_open_tunnel.py	2012-09-15 19:26:18 +0000
@@ -1,7 +1,8 @@
-from yaml import dump
 
+from juju.control import main, open_tunnel
+from juju.lib.serializer import dump
 from juju.providers.dummy import MachineProvider
-from juju.control import main, open_tunnel
+
 
 from .common import ControlToolTest
 

=== modified file 'juju/control/tests/test_remove_relation.py'
--- juju/control/tests/test_remove_relation.py	2012-05-04 22:43:40 +0000
+++ juju/control/tests/test_remove_relation.py	2012-09-15 19:26:18 +0000
@@ -1,12 +1,12 @@
 import logging
 
-import yaml
 
 from twisted.internet.defer import inlineCallbacks, returnValue
 
 from juju.charm.tests.test_repository import RepositoryTestBase
 from juju.control import main, remove_relation
 from juju.control.tests.common import ControlToolTest
+from juju.lib import serializer
 from juju.machine.tests.test_constraints import dummy_constraints
 from juju.state.errors import ServiceStateNotFound
 from juju.state.tests.test_service import ServiceStateManagerTestBase
@@ -22,7 +22,7 @@
             "environments": {
                 "firstenv": {
                     "type": "dummy", "admin-secret": "homer"}}}
-        self.write_config(yaml.dump(config))
+        self.write_config(serializer.dump(config))
         self.config.load()
         self.output = self.capture_logging()
         self.stderr = self.capture_stream("stderr")

=== modified file 'juju/control/tests/test_scp.py'
--- juju/control/tests/test_scp.py	2012-03-27 23:56:09 +0000
+++ juju/control/tests/test_scp.py	2012-09-15 19:26:18 +0000
@@ -1,7 +1,6 @@
 import logging
 import os
 
-from yaml import dump
 
 from twisted.internet.defer import inlineCallbacks
 

=== modified file 'juju/control/tests/test_status.py'
--- juju/control/tests/test_status.py	2012-08-09 09:53:55 +0000
+++ juju/control/tests/test_status.py	2012-09-15 19:26:18 +0000
@@ -4,7 +4,7 @@
 import logging
 import os
 from StringIO import StringIO
-import yaml
+
 
 from twisted.internet.defer import inlineCallbacks, returnValue
 
@@ -13,7 +13,7 @@
 from juju.environment.environment import Environment
 from juju.control import status
 from juju.control import tests
-from juju.lib.mocker import ANY
+from juju.lib import serializer
 from juju.state.endpoint import RelationEndpoint
 from juju.state.environment import GlobalSettingsStateManager
 from juju.state.tests.test_service import ServiceStateManagerTestBase
@@ -24,7 +24,7 @@
 
 tests_path = os.path.dirname(inspect.getabsfile(tests))
 sample_path = os.path.join(tests_path, "sample_cluster.yaml")
-sample_cluster = yaml.load(open(sample_path, "r"))
+sample_cluster = serializer.load(open(sample_path, "r"))
 
 
 def dump_stringio(stringio, filename):
@@ -643,7 +643,7 @@
 
         yield status.status(self.environment, [],
                             status.render_yaml, self.output, None)
-        state = yaml.load(self.output.getvalue())
+        state = serializer.yaml_load(self.output.getvalue())
 
         self.assertEqual(set(state["machines"].keys()),
                          set([0, 1, 2, 3, 4, 5, 6]))
@@ -863,7 +863,7 @@
         yield status.status(self.environment, [],
                             status.render_yaml, self.output, None)
 
-        state = yaml.load(self.output.getvalue())
+        state = serializer.load(self.output.getvalue())
 
         # verify our changes
         log_state = state["services"]["logging"]
@@ -920,6 +920,6 @@
         yield status.status(self.environment, [],
                             status.render_yaml, self.output, None)
 
-        output = yaml.load(self.output.getvalue())
+        output = serializer.load(self.output.getvalue())
         self.assertNotIn(mu1.unit_name, output["services"]["mysql"]["units"])
         self.assertIn(mu2.unit_name, output["services"]["mysql"]["units"])

=== modified file 'juju/control/tests/test_unexpose.py'
--- juju/control/tests/test_unexpose.py	2012-05-04 22:43:40 +0000
+++ juju/control/tests/test_unexpose.py	2012-09-15 19:26:18 +0000
@@ -1,8 +1,8 @@
-import yaml
 from twisted.internet.defer import inlineCallbacks
 
 from juju.control import main
 from juju.control.tests.common import ControlToolTest
+from juju.lib import serializer
 from juju.state.tests.test_service import ServiceStateManagerTestBase
 
 
@@ -15,7 +15,7 @@
         config = {
             "environments": {"firstenv": {"type": "dummy"}}}
 
-        self.write_config(yaml.dump(config))
+        self.write_config(serializer.dump(config))
         self.config.load()
         self.service_state = yield self.add_service_from_charm("wordpress")
         self.output = self.capture_logging()

=== modified file 'juju/control/tests/test_upgrade_charm.py'
--- juju/control/tests/test_upgrade_charm.py	2012-08-06 19:29:30 +0000
+++ juju/control/tests/test_upgrade_charm.py	2012-09-15 19:26:18 +0000
@@ -1,6 +1,5 @@
 import json
 import os
-from yaml import dump
 
 from twisted.internet.defer import inlineCallbacks, succeed
 
@@ -11,8 +10,10 @@
 from juju.control import main
 from juju.errors import FileNotFound
 from juju.environment.environment import Environment
+from juju.lib.mocker import ANY
+from juju.lib.serializer import dump
 from juju.unit.workflow import UnitWorkflowState
-from juju.lib.mocker import ANY
+
 
 from .common import MachineControlToolTest
 

=== modified file 'juju/control/tests/test_utils.py'
--- juju/control/tests/test_utils.py	2012-03-27 23:56:09 +0000
+++ juju/control/tests/test_utils.py	2012-09-15 19:26:18 +0000
@@ -1,7 +1,6 @@
 import os
 
 from twisted.internet.defer import inlineCallbacks, returnValue
-from yaml import dump
 
 from juju.environment.tests.test_config import EnvironmentsConfigTestBase
 from juju.control.tests.common import ControlToolTest
@@ -10,6 +9,7 @@
     expand_path, parse_passthrough_args, ParseError)
 from juju.environment.config import EnvironmentsConfig
 from juju.environment.errors import EnvironmentsConfigError
+from juju.lib.serializer import yaml_dump as dump
 from juju.lib.testing import TestCase
 from juju.state.errors import ServiceUnitStateMachineNotAssigned
 from juju.state.tests.test_service import ServiceStateManagerTestBase

=== modified file 'juju/environment/config.py'
--- juju/environment/config.py	2012-08-31 15:03:31 +0000
+++ juju/environment/config.py	2012-09-15 19:26:18 +0000
@@ -5,6 +5,7 @@
 from juju.environment.environment import Environment
 from juju.environment.errors import EnvironmentsConfigError
 from juju.errors import FileAlreadyExists, FileNotFound
+from juju.lib import serializer
 from juju.lib.schema import (
     Constant, Dict, Int, KeyDict, OAuthString, OneOf, SchemaError, SelectDict,
     String, Bool)
@@ -174,7 +175,7 @@
             self._fail("Configuration must be a string", path, repr(content))
 
         try:
-            config = yaml.load(content)
+            config = serializer.yaml_load(content)
         except yaml.YAMLError, error:
             self._fail(error, path=path, content=content)
 
@@ -309,4 +310,4 @@
             assert data.keys() == [name]
             config["environments"].update(data)
 
-        return yaml.safe_dump(config)
+        return serializer.dump(config)

=== modified file 'juju/environment/tests/test_config.py'
--- juju/environment/tests/test_config.py	2012-08-31 15:17:53 +0000
+++ juju/environment/tests/test_config.py	2012-09-15 19:26:18 +0000
@@ -1,5 +1,4 @@
 import os
-import yaml
 
 from twisted.internet.defer import inlineCallbacks
 
@@ -8,8 +7,10 @@
 from juju.environment.environment import Environment
 from juju.environment.errors import EnvironmentsConfigError
 from juju.errors import FileNotFound, FileAlreadyExists
+from juju.lib import serializer
 from juju.state.environment import EnvironmentStateManager
 
+
 from juju.lib.testing import TestCase
 
 
@@ -102,7 +103,7 @@
     # self.client.
 
     def push_config(self, name, config):
-        self.write_config(yaml.dump(config))
+        self.write_config(serializer.yaml_dump(config))
         self.config.load()
         esm = EnvironmentStateManager(self.client)
         return esm.set_config_state(self.config, name)
@@ -129,8 +130,8 @@
         self.assertEquals(self.config.get_default_path(), self.default_path)
 
     def compare_config(self, config1, sample_config2):
-        config1 = yaml.load(config1)
-        config2 = yaml.load(
+        config1 = serializer.yaml_load(config1)
+        config2 = serializer.yaml_load(
             sample_config2 % config1["environments"]["sample"])
         self.assertEqual(config1, config2)
 
@@ -193,7 +194,7 @@
         self.assertTrue(os.path.isfile(self.default_path))
 
         with open(self.default_path) as file:
-            config = yaml.load(file.read())
+            config = serializer.yaml_load(file.read())
             self.assertEqual(
                 config["environments"]["sample"]["type"], "ec2")
             self.assertEqual(
@@ -373,9 +374,9 @@
         get_default() must return the one defined environment, when it's
         indeed a single one.
         """
-        config = yaml.load(SAMPLE_ENV)
+        config = serializer.yaml_load(SAMPLE_ENV)
         del config["environments"]["mysecondenv"]
-        self.write_config(yaml.dump(config))
+        self.write_config(serializer.yaml_dump(config))
         self.config.load()
         env = self.config.get_default()
         self.assertEquals(env.name, "myfirstenv")
@@ -385,9 +386,9 @@
         get_default() must otherwise return the environment named
         through the "default:" option.
         """
-        config = yaml.load(SAMPLE_ENV)
+        config = serializer.yaml_load(SAMPLE_ENV)
         config["default"] = "mysecondenv"
-        self.write_config(yaml.dump(config))
+        self.write_config(serializer.yaml_dump(config))
         self.config.load()
         env = self.config.get_default()
         self.assertEquals(env.name, "mysecondenv")
@@ -396,9 +397,9 @@
         """
         The schema should mention the "default:" option as a string.
         """
-        config = yaml.load(SAMPLE_ENV)
+        config = serializer.yaml_load(SAMPLE_ENV)
         config["default"] = 1
-        self.write_config(yaml.dump(config))
+        self.write_config(serializer.yaml_dump(config))
         error = self.assertRaises(EnvironmentsConfigError, self.config.load)
         self.assertEquals(
             str(error),
@@ -410,10 +411,10 @@
         get_default() must raise an error if the environment named through
         the "default:" option isn't found.
         """
-        config = yaml.load(SAMPLE_ENV)
+        config = serializer.yaml_load(SAMPLE_ENV)
         config["default"] = "non-existent"
         # Use a different path to ensure the error message is right.
-        self.write_config(yaml.dump(config), other_path=True)
+        self.write_config(serializer.yaml_dump(config), other_path=True)
         self.config.load(self.other_path)
         try:
             self.config.get_default()
@@ -447,10 +448,10 @@
         contains a machine provider configuration without any type
         information.
         """
-        config = yaml.load(SAMPLE_ENV)
+        config = serializer.yaml_load(SAMPLE_ENV)
         # Delete the type.
         del config["environments"]["myfirstenv"]["type"]
-        self.write_config(yaml.dump(config), other_path=True)
+        self.write_config(serializer.yaml_dump(config), other_path=True)
 
         try:
             self.config.load(self.other_path)
@@ -468,12 +469,12 @@
         self.write_config(SAMPLE_ENV)
         self.config.load()
         config = self.config.serialize()
-        serialized = yaml.load(SAMPLE_ENV)
+        serialized = serializer.yaml_load(SAMPLE_ENV)
 
         for d in serialized["environments"].values():
             d["dynamicduck"] = "magic"
 
-        self.assertEqual(yaml.load(config), serialized)
+        self.assertEqual(serializer.yaml_load(config), serialized)
 
     def test_serialize_environment(self):
         """
@@ -484,12 +485,12 @@
         self.write_config(SAMPLE_ENV)
         self.config.load()
 
-        data = yaml.load(SAMPLE_ENV)
+        data = serializer.yaml_load(SAMPLE_ENV)
         del data["environments"]["mysecondenv"]
         data["environments"]["myfirstenv"]["dynamicduck"] = "magic"
 
         self.assertEqual(
-            yaml.load(self.config.serialize("myfirstenv")),
+            serializer.yaml_load(self.config.serialize("myfirstenv")),
             data)
 
     def test_load_serialized_environment(self):
@@ -518,9 +519,9 @@
 
     def test_serialize_custom_variables_outside_environment(self):
         """Serializing captures custom variables out of the environment."""
-        data = yaml.load(SAMPLE_ENV)
+        data = serializer.yaml_load(SAMPLE_ENV)
         data["default"] = "myfirstenv"
-        self.write_config(yaml.dump(data))
+        self.write_config(serializer.yaml_dump(data))
         self.config.load()
         serialized = self.config.serialize()
 
@@ -543,17 +544,17 @@
         self.write_config("\0")
         error = self.assertRaises(EnvironmentsConfigError, self.config.load)
         self.assertIn(
-            "special characters are not allowed", str(error))
+            "control characters are not allowed", str(error))
 
     def test_ec2_verifies_region(self):
         # sample doesn't include credentials
         self.setup_ec2_credentials()
         self.config.write_sample()
         with open(self.default_path) as file:
-            config = yaml.load(file.read())
+            config = serializer.yaml_load(file.read())
             config["environments"]["sample"]["region"] = "ap-southeast-2"
 
-            self.write_config(yaml.dump(config), other_path=True)
+            self.write_config(serializer.yaml_dump(config), other_path=True)
 
         e = self.assertRaises(EnvironmentsConfigError,
                           self.config.load,
@@ -562,11 +563,11 @@
                        str(e))
 
         with open(self.default_path) as file:
-            config = yaml.load(file.read())
+            config = serializer.yaml_load(file.read())
             # Authorized keys are required for environment serialization.
             config["environments"]["sample"]["authorized-keys"] = "mickey"
             config["environments"]["sample"]["region"] = "ap-southeast-1"
-            self.write_config(yaml.dump(config), other_path=True)
+            self.write_config(serializer.yaml_dump(config), other_path=True)
 
         self.config.load(self.other_path)
         data = self.config.get_default().get_serialization_data()
@@ -575,9 +576,9 @@
     def assert_ec2_sample_config(self, delete_key):
         self.config.write_sample()
         with open(self.default_path) as file:
-            config = yaml.load(file.read())
+            config = serializer.yaml_load(file.read())
             del config["environments"]["sample"][delete_key]
-            self.write_config(yaml.dump(config), other_path=True)
+            self.write_config(serializer.yaml_dump(config), other_path=True)
 
         try:
             self.config.load(self.other_path)
@@ -604,9 +605,9 @@
         self.setup_ec2_credentials()
         self.config.write_sample()
         with open(self.default_path) as file:
-            config = yaml.load(file.read())
+            config = serializer.yaml_load(file.read())
             config["environments"]["sample"]["placement"] = "random"
-            self.write_config(yaml.dump(config), other_path=True)
+            self.write_config(serializer.yaml_dump(config), other_path=True)
 
         e = self.assertRaises(EnvironmentsConfigError,
                           self.config.load,
@@ -615,11 +616,11 @@
                        str(e))
 
         with open(self.default_path) as file:
-            config = yaml.load(file.read())
+            config = serializer.yaml_load(file.read())
             # Authorized keys are required for environment serialization.
             config["environments"]["sample"]["authorized-keys"] = "mickey"
             config["environments"]["sample"]["placement"] = "local"
-            self.write_config(yaml.dump(config), other_path=True)
+            self.write_config(serializer.yaml_dump(config), other_path=True)
 
         self.config.load(self.other_path)
         data = self.config.get_default().get_serialization_data()
@@ -630,9 +631,9 @@
         self.setup_ec2_credentials()
         self.config.write_sample()
         with open(self.default_path) as f:
-            config = yaml.load(f.read())
+            config = serializer.yaml_load(f.read())
         config["environments"]["sample"]["default-series"] = "astounding"
-        self.write_config(yaml.dump(config), other_path=True)
+        self.write_config(serializer.yaml_dump(config), other_path=True)
 
         self.config.load(self.other_path)
 
@@ -643,9 +644,9 @@
         self.setup_ec2_credentials()
         self.config.write_sample()
         with open(self.default_path) as f:
-            config = yaml.load(f.read())
+            config = serializer.yaml_load(f.read())
         config["environments"]["sample"]["ssl-hostname-verification"] = True
-        self.write_config(yaml.dump(config), other_path=True)
+        self.write_config(serializer.yaml_dump(config), other_path=True)
 
         self.config.load(self.other_path)
 
@@ -658,9 +659,9 @@
             "admin-secret acquired-mgmt-class available-mgmt-class "
             "default-series").split()
         for require in requires:
-            config = yaml.load(SAMPLE_ORCHESTRA)
+            config = serializer.yaml_load(SAMPLE_ORCHESTRA)
             del config["environments"]["sample"][require]
-            self.write_config(yaml.dump(config), other_path=True)
+            self.write_config(serializer.yaml_dump(config), other_path=True)
 
             try:
                 self.config.load(self.other_path)
@@ -675,25 +676,25 @@
                           % require)
 
     def test_orchestra_respects_default_series(self):
-        config = yaml.load(SAMPLE_ORCHESTRA)
+        config = serializer.yaml_load(SAMPLE_ORCHESTRA)
         config["environments"]["sample"]["default-series"] = "magnificent"
-        self.write_config(yaml.dump(config), other_path=True)
+        self.write_config(serializer.yaml_dump(config), other_path=True)
         self.config.load(self.other_path)
 
         provider = self.config.get_default().get_machine_provider()
         self.assertEqual(provider.config["default-series"], "magnificent")
 
     def test_orchestra_verifies_placement(self):
-        config = yaml.load(SAMPLE_ORCHESTRA)
+        config = serializer.yaml_load(SAMPLE_ORCHESTRA)
         config["environments"]["sample"]["placement"] = "random"
-        self.write_config(yaml.dump(config), other_path=True)
+        self.write_config(serializer.yaml_dump(config), other_path=True)
         e = self.assertRaises(
             EnvironmentsConfigError, self.config.load, self.other_path)
         self.assertIn("expected 'unassigned', got 'random'",
                        str(e))
 
         config["environments"]["sample"]["placement"] = "local"
-        self.write_config(yaml.dump(config), other_path=True)
+        self.write_config(serializer.yaml_dump(config), other_path=True)
         self.config.load(self.other_path)
 
         data = self.config.get_default().placement
@@ -702,9 +703,9 @@
     def test_maas_schema_requires(self):
         requires = "maas-server maas-oauth admin-secret default-series".split()
         for require in requires:
-            config = yaml.load(SAMPLE_MAAS)
+            config = serializer.yaml_load(SAMPLE_MAAS)
             del config["environments"]["sample"][require]
-            self.write_config(yaml.dump(config), other_path=True)
+            self.write_config(serializer.yaml_dump(config), other_path=True)
 
             try:
                 self.config.load(self.other_path)
@@ -719,9 +720,9 @@
                           % require)
 
     def test_maas_default_series(self):
-        config = yaml.load(SAMPLE_MAAS)
+        config = serializer.yaml_load(SAMPLE_MAAS)
         config["environments"]["sample"]["default-series"] = "magnificent"
-        self.write_config(yaml.dump(config), other_path=True)
+        self.write_config(serializer.yaml_dump(config), other_path=True)
         e = self.assertRaises(
             EnvironmentsConfigError, self.config.load, self.other_path)
         self.assertIn(
@@ -730,16 +731,16 @@
             str(e))
 
     def test_maas_verifies_placement(self):
-        config = yaml.load(SAMPLE_MAAS)
+        config = serializer.yaml_load(SAMPLE_MAAS)
         config["environments"]["sample"]["placement"] = "random"
-        self.write_config(yaml.dump(config), other_path=True)
+        self.write_config(serializer.yaml_dump(config), other_path=True)
         e = self.assertRaises(
             EnvironmentsConfigError, self.config.load, self.other_path)
         self.assertIn("expected 'unassigned', got 'random'",
                        str(e))
 
         config["environments"]["sample"]["placement"] = "local"
-        self.write_config(yaml.dump(config), other_path=True)
+        self.write_config(serializer.yaml_dump(config), other_path=True)
         self.config.load(self.other_path)
 
         data = self.config.get_default().placement
@@ -747,51 +748,51 @@
 
     def test_lxc_requires_data_dir(self):
         """lxc dev only supports local placement."""
-        config = yaml.load(SAMPLE_LOCAL)
-        self.write_config(yaml.dump(config), other_path=True)
+        config = serializer.yaml_load(SAMPLE_LOCAL)
+        self.write_config(serializer.yaml_dump(config), other_path=True)
         error = self.assertRaises(
             EnvironmentsConfigError, self.config.load, self.other_path)
         self.assertIn("data-dir: required value not found", str(error))
 
     def test_lxc_verifies_placement(self):
         """lxc dev only supports local placement."""
-        config = yaml.load(SAMPLE_LOCAL)
+        config = serializer.yaml_load(SAMPLE_LOCAL)
         config["environments"]["sample"]["placement"] = "unassigned"
-        self.write_config(yaml.dump(config), other_path=True)
+        self.write_config(serializer.yaml_dump(config), other_path=True)
         error = self.assertRaises(
             EnvironmentsConfigError, self.config.load, self.other_path)
         self.assertIn("expected 'local', got 'unassigned'", str(error))
 
     def test_openstack_requires_default_image_id(self):
         """A VM image must be supplied for openstack provider."""
-        config = yaml.load(SAMPLE_OPENSTACK)
+        config = serializer.yaml_load(SAMPLE_OPENSTACK)
         del config["environments"]["sample"]["default-image-id"]
-        self.write_config(yaml.dump(config), other_path=True)
+        self.write_config(serializer.yaml_dump(config), other_path=True)
         error = self.assertRaises(
             EnvironmentsConfigError, self.config.load, self.other_path)
         self.assertIn("default-image-id: required value not found", str(error))
 
     def test_openstack_ignores_placement(self):
         """The placement config is not verified for openstack provider."""
-        config = yaml.load(SAMPLE_OPENSTACK)
+        config = serializer.yaml_load(SAMPLE_OPENSTACK)
         config["environments"]["sample"]["placement"] = "whatever"
-        self.write_config(yaml.dump(config), other_path=True)
+        self.write_config(serializer.yaml_dump(config), other_path=True)
         self.config.load(self.other_path)
 
     def test_openstack_s3_requires_default_image_id(self):
         """A VM image must be supplied for openstack_s3 provider."""
-        config = yaml.load(SAMPLE_OPENSTACK)
+        config = serializer.yaml_load(SAMPLE_OPENSTACK)
         config["environments"]["sample"]["type"] = "openstack_s3"
         del config["environments"]["sample"]["default-image-id"]
-        self.write_config(yaml.dump(config), other_path=True)
+        self.write_config(serializer.yaml_dump(config), other_path=True)
         error = self.assertRaises(
             EnvironmentsConfigError, self.config.load, self.other_path)
         self.assertIn("default-image-id: required value not found", str(error))
 
     def test_openstack_s3_ignores_placement(self):
         """The placement config is not verified for openstack_s3 provider."""
-        config = yaml.load(SAMPLE_OPENSTACK)
+        config = serializer.yaml_load(SAMPLE_OPENSTACK)
         config["environments"]["sample"]["type"] = "openstack_s3"
         config["environments"]["sample"]["placement"] = "whatever"
-        self.write_config(yaml.dump(config), other_path=True)
+        self.write_config(serializer.yaml_dump(config), other_path=True)
         self.config.load(self.other_path)

=== modified file 'juju/hooks/protocol.py'
--- juju/hooks/protocol.py	2012-08-30 03:25:04 +0000
+++ juju/hooks/protocol.py	2012-09-15 19:26:18 +0000
@@ -48,9 +48,10 @@
 from twisted.internet import defer
 from twisted.internet import protocol
 from twisted.protocols import amp
-import yaml
+
 
 from juju.errors import JujuError
+from juju.lib import serializer
 from juju.lib.format import get_charm_formatter, get_charm_formatter_from_env
 from juju.state.errors import UnitRelationStateNotFound
 from juju.state.hook import RelationHookContext
@@ -310,7 +311,7 @@
 
         # NOTE: no need to consider charm format for blob here, this
         # blob has always been in YAML format
-        defer.returnValue(dict(data=yaml.safe_dump(options)))
+        defer.returnValue(dict(data=serializer.dump(options)))
 
     @OpenPortCommand.responder
     @defer.inlineCallbacks
@@ -457,7 +458,7 @@
                                        client_id=client_id,
                                        option_name=option_name)
         # Unbundle and deserialize
-        result = yaml.safe_load(result["data"])
+        result = serializer.load(result["data"])
         defer.returnValue(result)
 
     @defer.inlineCallbacks

=== modified file 'juju/hooks/scheduler.py'
--- juju/hooks/scheduler.py	2012-03-30 05:17:34 +0000
+++ juju/hooks/scheduler.py	2012-09-15 19:26:18 +0000
@@ -1,10 +1,11 @@
 import logging
 import os
-import yaml
+
 
 from twisted.internet.defer import (
     DeferredQueue, inlineCallbacks, succeed, Deferred,
     QueueUnderflow, QueueOverflow)
+from juju.lib import serializer
 from juju.state.hook import RelationHookContext, RelationChange
 
 
@@ -202,7 +203,7 @@
 
     def _load_state(self):
         with open(self._state_path) as f:
-            state = yaml.load(f.read())
+            state = serializer.load(f.read())
             if not state:
                 return self._create_state()
         self._context_members = set(state["context_members"])
@@ -211,7 +212,7 @@
         self._run_queue.pending = state["change_queue"]
 
     def _save_state(self):
-        state = yaml.dump({
+        state = serializer.dump({
             "context_members": sorted(self._context_members),
             "member_versions": self._member_versions,
             "change_queue": self._run_queue.pending})

=== modified file 'juju/hooks/tests/test_invoker.py'
--- juju/hooks/tests/test_invoker.py	2012-09-01 05:22:05 +0000
+++ juju/hooks/tests/test_invoker.py	2012-09-15 19:26:18 +0000
@@ -7,7 +7,6 @@
 import os
 import stat
 import sys
-import yaml
 
 from twisted.internet import defer
 from twisted.internet.process import Process
@@ -20,6 +19,7 @@
 from juju.hooks import invoker
 from juju.hooks import commands
 from juju.hooks.protocol import UnitSettingsFactory
+from juju.lib import serializer
 from juju.lib.mocker import MATCH
 from juju.lib.twistutils import get_module_directory
 from juju.state import hook
@@ -728,7 +728,7 @@
         zk_data = yield self.relation.get_data()
         self.assertEqual(
             {"a": "b", "c": "d", "private-address": "mysql-0.example.com"},
-            yaml.load(zk_data))
+            serializer.load(zk_data))
         yield exe.ended
         self.assertIn(
             "Flushed values for hook %r on 'database:42'\n"
@@ -771,7 +771,7 @@
         self.assertEqual(
             {"new-value": "2", "changed": "abc", "changed2": "xyz",
              "private-address": "mysql-0.example.com"},
-            yaml.load(zk_data))
+            serializer.load(zk_data))
 
         # Verify that unicode/strings longer than 100 characters in
         # representation (including quotes and the u marker) are cut
@@ -816,7 +816,7 @@
         zk_data = yield self.relation.get_data()
         self.assertEqual({"no-change": "42", "untouched": "xyz",
                           "private-address": "mysql-0.example.com"},
-                         yaml.load(zk_data))
+                         serializer.load(zk_data))
         self.assertNotIn(
             "Flushed values for hook 'set-does-nothing'",
             output.getvalue())
@@ -960,7 +960,7 @@
         internal_unit_id = (yield context.get_local_unit_state()).internal_id
         path = yield context.get_settings_path(internal_unit_id)
         data, stat = yield self.client.get(path)
-        self.assertEqual(yaml.load(data), expected)
+        self.assertEqual(serializer.load(data), expected)
 
     @defer.inlineCallbacks
     def test_implied_relation_hook_context(self):

=== modified file 'juju/hooks/tests/test_scheduler.py'
--- juju/hooks/tests/test_scheduler.py	2012-03-28 02:55:12 +0000
+++ juju/hooks/tests/test_scheduler.py	2012-09-15 19:26:18 +0000
@@ -1,10 +1,9 @@
 import logging
 import os
-import yaml
 
 from twisted.internet.defer import (
     inlineCallbacks, fail, succeed, Deferred, returnValue)
-
+from juju.lib import serializer
 from juju.hooks.scheduler import HookScheduler
 from juju.state.tests.test_service import ServiceStateManagerTestBase
 
@@ -44,7 +43,7 @@
 
     def write_single_unit_state(self):
         with open(self.state_file, "w") as f:
-            f.write(yaml.dump({
+            f.write(serializer.dump({
                 "context_members": ["u-1"],
                 "member_versions": {"u-1": 0},
                 "unit_ops": {},
@@ -82,7 +81,7 @@
         yield sched_done
         self.assertFalse(self.scheduler.running)
         with open(self.state_file) as f:
-            self.assertEquals(yaml.load(f.read()), {
+            self.assertEquals(serializer.load(f.read()), {
                 "context_members": ['u-1'],
                 "member_versions": {"u-1": 0},
                 "change_queue": [
@@ -118,7 +117,7 @@
         self.assertFalse(collected)
 
         with open(self.state_file) as f:
-            self.assertEquals(yaml.load(f.read()), {
+            self.assertEquals(serializer.load(f.read()), {
                 "context_members": [],
                 "member_versions": {},
                 "change_queue": [
@@ -163,7 +162,7 @@
         self.scheduler.cb_change_members(["u-1"], ["u-2"])
 
         with open(self.state_file) as f:
-            self.assertEquals(yaml.load(f.read()), {
+            self.assertEquals(serializer.load(f.read()), {
                 "context_members": ['u-2'],
                 "member_versions": {"u-2": 0},
                 "change_queue": [
@@ -200,7 +199,7 @@
         self.assertFalse(self.scheduler.running)
 
         with open(self.state_file) as f:
-            self.assertEquals(yaml.load(f.read()), {
+            self.assertEquals(serializer.load(f.read()), {
                 "context_members": ['u-2'],
                 "member_versions": {"u-2": 0},
                 "change_queue": [
@@ -318,7 +317,7 @@
              ("u-1", "modified", ["u-1"])])
 
         with open(self.state_file) as f:
-            self.assertEquals(yaml.load(f.read()), {
+            self.assertEquals(serializer.load(f.read()), {
                 "context_members": ['u-1'],
                 "member_versions": {"u-1": 0},
                 "change_queue": []})
@@ -468,7 +467,7 @@
 
     def test_empty_state(self):
         with open(self.state_file, "w") as f:
-            f.write(yaml.dump({}))
+            f.write(serializer.dump({}))
 
         # Induce lazy creation to verify it can still survive
         self.scheduler
@@ -527,7 +526,7 @@
         it hasn't previously been given a notify of before.
         """
         with open(self.state_file, "w") as f:
-            f.write(yaml.dump({
+            f.write(serializer.dump({
                 "context_members": ["u-1", "u-2"],
                 "member_versions": {"u-1": 0, "u-2": 0},
                 "change_queue": []}))
@@ -559,7 +558,7 @@
         self.assertEqual(members, ["u-2", "u-3", "u-4"])
 
         with open(self.state_file) as f:
-            state = yaml.load(f.read())
+            state = serializer.load(f.read())
             self.assertEquals(state, {
                 "change_queue": [],
                 "context_members": ["u-2", "u-3", "u-4"],
@@ -568,7 +567,7 @@
     @inlineCallbacks
     def test_state_is_loaded(self):
         with open(self.state_file, "w") as f:
-            f.write(yaml.dump({
+            f.write(serializer.dump({
                 "context_members": ["u-1", "u-2", "u-3"],
                 "member_versions": {"u-1": 5, "u-2": 2, "u-3": 0},
                 "change_queue": [
@@ -594,7 +593,7 @@
         self.assertEqual(members, ["u-1", "u-2", "u-3"])
 
         with open(self.state_file) as f:
-            state = yaml.load(f.read())
+            state = serializer.load(f.read())
         self.assertEquals(state, {
             "context_members": ["u-1", "u-2", "u-3"],
             "member_versions": {"u-1": 5, "u-2": 2, "u-3": 0},
@@ -602,7 +601,7 @@
 
     def test_state_is_stored(self):
         with open(self.state_file, "w") as f:
-            f.write(yaml.dump({
+            f.write(serializer.dump({
                 "context_members": ["u-1", "u-2"],
                 "member_versions": {"u-1": 0, "u-2": 2},
                 "change_queue": []}))
@@ -614,7 +613,7 @@
         self.scheduler.stop()
 
         with open(self.state_file) as f:
-            state = yaml.load(f.read())
+            state = serializer.load(f.read())
             self.assertEquals(state, {
                 "context_members": ["u-2", "u-3"],
                 "member_versions": {"u-2": 3, "u-3": 0},
@@ -641,7 +640,7 @@
         self.executor = execute
 
         with open(self.state_file, "w") as f:
-            f.write(yaml.dump({
+            f.write(serializer.dump({
             "context_members": ["u-1", "u-2"],
             "member_versions": {"u-1": 1, "u-2": 0, "u-3": 0},
             "change_queue": [
@@ -655,7 +654,7 @@
             yield self.poke_zk()
         yield self.assertFailure(d, SomeError)
         with open(self.state_file) as f:
-            self.assertEquals(yaml.load(f.read()), {
+            self.assertEquals(serializer.load(f.read()), {
                 "context_members": ["u-1", "u-2"],
                 "member_versions": {"u-1": 1, "u-2": 0, "u-3": 0},
                 "change_queue": [
@@ -681,14 +680,14 @@
                  "members":["u-1", "u-2", "u-3"]},
                 ]}
         with open(self.state_file, "w") as f:
-            f.write(yaml.dump(initial_state))
+            f.write(serializer.dump(initial_state))
 
         d = self.scheduler.run()
         while not self.execute_called:
             yield self.poke_zk()
         yield self.assertFailure(d, SomeError)
         with open(self.state_file) as f:
-            self.assertEquals(yaml.load(f.read()), initial_state)
+            self.assertEquals(serializer.load(f.read()), initial_state)
 
     def test_ignore_equal_settings_version(self):
         """
@@ -718,7 +717,7 @@
         on old_units.
         """
         with open(self.state_file, "w") as f:
-            f.write(yaml.dump({
+            f.write(serializer.dump({
             "context_members": ["u-1", "u-2"],
             "member_versions": {"u-1": 0, "u-2": 0},
             "change_queue": []}))

=== modified file 'juju/lib/format.py'
--- juju/lib/format.py	2012-09-01 05:22:05 +0000
+++ juju/lib/format.py	2012-09-15 19:26:18 +0000
@@ -90,9 +90,9 @@
         # output format, False
         if data is None:
             return ""
-        serialized = yaml.safe_dump(
+        serialized = yaml.dump(
             data, indent=4, default_flow_style=False, width=80,
-            allow_unicode=True)
+            allow_unicode=True, Dumper=yaml.CSafeDumper)
         if serialized.endswith("\n...\n"):
             # Remove explicit doc end sentinel, still valid yaml
             serialized = serialized[0:-5]
@@ -111,7 +111,7 @@
 
     def load(self, data):
         """Loads data safely, ensuring no Python specific type info leaks"""
-        return yaml.safe_load(data)
+        return yaml.load(data, Loader=yaml.CSafeLoader)
 
 
 def is_valid_charm_format(charm_format):

=== added file 'juju/lib/serializer.py'
--- juju/lib/serializer.py	1970-01-01 00:00:00 +0000
+++ juju/lib/serializer.py	2012-09-15 19:26:18 +0000
@@ -0,0 +1,21 @@
+from yaml import CSafeLoader, CSafeDumper, Mark
+from yaml import dump as _dump
+from yaml import load as _load
+
+def dump(value):
+    return _dump(value, Dumper=CSafeDumper)
+
+yaml_dump = dump
+
+def load(value):
+    return _load(value, Loader=CSafeLoader)
+
+yaml_load = load
+
+def yaml_mark_with_path(path, mark):
+    # yaml c ext, cant be modded, convert to capture path
+    return Mark(
+        path, mark.index,
+        mark.line, mark.column,
+        mark.buffer, mark.pointer)
+

=== modified file 'juju/providers/common/cloudinit.py'
--- juju/providers/common/cloudinit.py	2012-05-29 15:23:08 +0000
+++ juju/providers/common/cloudinit.py	2012-09-15 19:26:18 +0000
@@ -1,9 +1,10 @@
 from base64 import b64encode
 from subprocess import Popen, PIPE
-from yaml import safe_dump
+
 
 from juju.errors import CloudInitError
 from juju.lib.upstart import UpstartService
+from juju.lib import serializer
 from juju.providers.common.utils import format_cloud_init
 from juju.state.auth import make_identity
 import juju
@@ -41,7 +42,7 @@
         " --constraints-data=%s"
         " --provider-type=%s"
         % (instance_id, make_identity("admin:%s" % secret),
-           b64encode(safe_dump(constraints.data)), provider_type)]
+           b64encode(serializer.dump(constraints.data)), provider_type)]
 
 
 def _machine_scripts(machine_id, zookeeper_hosts):

=== modified file 'juju/providers/common/state.py'
--- juju/providers/common/state.py	2011-09-15 18:50:23 +0000
+++ juju/providers/common/state.py	2012-09-15 19:26:18 +0000
@@ -1,5 +1,6 @@
 from cStringIO import StringIO
-from yaml import safe_dump, load
+from juju.lib import serializer
+
 
 from juju.errors import FileNotFound
 
@@ -28,7 +29,7 @@
         return d
 
     def _deserialize(self, data):
-        return load(data.read()) or False
+        return serializer.load(data.read()) or False
 
     def _no_data(self, failure):
         failure.trap(FileNotFound)
@@ -51,5 +52,5 @@
         :param dict state: state to save.
         """
         storage = self._provider.get_file_storage()
-        data = safe_dump(state)
+        data = serializer.dump(state)
         return storage.put(_STATE_FILE, StringIO(data))

=== modified file 'juju/providers/common/tests/test_cloudinit.py'
--- juju/providers/common/tests/test_cloudinit.py	2012-05-22 22:08:15 +0000
+++ juju/providers/common/tests/test_cloudinit.py	2012-09-15 19:26:18 +0000
@@ -1,9 +1,9 @@
 import os
 import stat
 
-import yaml
 
 from juju.errors import CloudInitError
+from juju.lib import serializer
 from juju.lib.testing import TestCase
 from juju.machine.tests.test_constraints import dummy_cs
 from juju.providers.common.cloudinit import (
@@ -46,10 +46,10 @@
 
     def assert_render(self, cloud_init, name):
         with open(os.path.join(DATA_DIR, name)) as f:
-            expected = yaml.load(f.read())
+            expected = serializer.load(f.read())
         rendered = cloud_init.render()
         self.assertTrue(rendered.startswith("#cloud-config"))
-        self.assertEquals(yaml.load(rendered), expected)
+        self.assertEquals(serializer.load(rendered), expected)
 
     def test_render_validate_normal(self):
         cloud_init = CloudInit()

=== modified file 'juju/providers/common/tests/test_findzookeepers.py'
--- juju/providers/common/tests/test_findzookeepers.py	2012-07-18 19:46:53 +0000
+++ juju/providers/common/tests/test_findzookeepers.py	2012-09-15 19:26:18 +0000
@@ -1,9 +1,9 @@
 from cStringIO import StringIO
-from yaml import dump
 
 from twisted.internet.defer import fail, succeed
 
 from juju.errors import EnvironmentNotFound, MachinesNotFound
+from juju.lib import serializer
 from juju.lib.testing import TestCase
 from juju.providers.common.base import MachineProviderBase
 
@@ -21,7 +21,7 @@
 
             def get(self, path):
                 test.assertEquals(path, "provider-state")
-                return succeed(StringIO(dump(state)))
+                return succeed(StringIO(serializer.dump(state)))
 
         class DummyProvider(MachineProviderBase):
 

=== modified file 'juju/providers/common/tests/test_state.py'
--- juju/providers/common/tests/test_state.py	2011-09-15 18:50:23 +0000
+++ juju/providers/common/tests/test_state.py	2012-09-15 19:26:18 +0000
@@ -1,10 +1,10 @@
 from cStringIO import StringIO
-from yaml import dump
 
 from twisted.internet.defer import fail, succeed
 
 from juju.errors import FileNotFound
 from juju.lib.mocker import MATCH
+from juju.lib import serializer
 from juju.lib.testing import TestCase
 from juju.providers.common.base import MachineProviderBase
 from juju.providers.common.state import LoadState, SaveState
@@ -39,7 +39,8 @@
         return load_state.run()
 
     def test_load_state(self):
-        d = self.mock_get(succeed(StringIO(dump({"some": "thing"}))))
+        d = self.mock_get(succeed(StringIO(
+            serializer.dump({"some": "thing"}))))
 
         def verify(result):
             self.assertEquals(result, {"some": "thing"})
@@ -74,7 +75,7 @@
 class SaveStateTest(TestCase):
 
     def is_expected_yaml(self, result):
-        return result.read() == dump({"some": "thing"})
+        return result.read() == serializer.dump({"some": "thing"})
 
     def test_save(self):
         put = self.mocker.mock()

=== modified file 'juju/providers/common/tests/test_utils.py'
--- juju/providers/common/tests/test_utils.py	2012-08-23 16:14:42 +0000
+++ juju/providers/common/tests/test_utils.py	2012-09-15 19:26:18 +0000
@@ -1,10 +1,10 @@
 import os
-from yaml import load
 
 from twisted.python.failure import Failure
 
 from juju.environment.tests.test_config import EnvironmentsConfigTestBase
 from juju.errors import ProviderInteractionError, JujuError
+from juju.lib import serializer
 from juju.lib.testing import TestCase
 from juju.providers.common.utils import (
     convert_unknown_error, format_cloud_init, get_user_authorized_keys)
@@ -107,7 +107,7 @@
 
         lines = output.split("\n")
         self.assertEqual(lines.pop(0), "#cloud-config")
-        config = load("\n".join(lines))
+        config = serializer.load("\n".join(lines))
         self.assertEqual(config["ssh_authorized_keys"], ["zebra"])
         self.assertTrue(config["apt_update"])
         self.assertTrue(config["apt_upgrade"])

=== modified file 'juju/providers/common/utils.py'
--- juju/providers/common/utils.py	2012-08-23 16:14:42 +0000
+++ juju/providers/common/utils.py	2012-09-15 19:26:18 +0000
@@ -1,9 +1,10 @@
 import logging
 import os
-from yaml import safe_dump
+
 
 from twisted.python.failure import Failure
 
+from juju.lib import serializer
 from juju.errors import JujuError, ProviderInteractionError
 
 log = logging.getLogger("juju.common")
@@ -136,6 +137,6 @@
     if scripts:
         cloud_config["runcmd"] = scripts
 
-    output = safe_dump(cloud_config)
+    output = serializer.dump(cloud_config)
     output = "#cloud-config\n%s" % (output)
     return output

=== modified file 'juju/providers/ec2/tests/common.py'
--- juju/providers/ec2/tests/common.py	2012-07-05 21:49:12 +0000
+++ juju/providers/ec2/tests/common.py	2012-09-15 19:26:18 +0000
@@ -1,4 +1,3 @@
-from yaml import dump
 
 from twisted.internet.defer import fail, succeed, inlineCallbacks, returnValue
 
@@ -8,6 +7,7 @@
 from txaws.ec2.exception import EC2Error
 from txaws.ec2.model import Instance, Reservation, SecurityGroup
 
+from juju.lib import serializer
 from juju.lib.mocker import KWARGS, MATCH
 from juju.providers.ec2 import MachineProvider
 from juju.providers.ec2.machine import EC2ProviderMachine
@@ -156,7 +156,7 @@
             self.mocker.result(fail(error))
             return
 
-        state = dump({
+        state = serializer.dump({
             "zookeeper-instances":
             [i.instance_id for i in hosts]})
 

=== modified file 'juju/providers/ec2/tests/test_bootstrap.py'
--- juju/providers/ec2/tests/test_bootstrap.py	2012-03-29 01:37:57 +0000
+++ juju/providers/ec2/tests/test_bootstrap.py	2012-09-15 19:26:18 +0000
@@ -1,12 +1,11 @@
 import logging
 import os
 
-import yaml
-
 from twisted.internet.defer import succeed, inlineCallbacks
 
 from txaws.ec2.model import SecurityGroup
 
+from juju.lib import serializer
 from juju.lib.mocker import MATCH
 from juju.lib.testing import TestCase
 from juju.providers.ec2.machine import EC2ProviderMachine
@@ -40,8 +39,8 @@
         def verify_user_data(data):
             expect_path = os.path.join(DATA_DIR, "bootstrap_cloud_init")
             with open(expect_path) as f:
-                expect_cloud_init = yaml.load(f.read())
-            self.assertEquals(yaml.load(data), expect_cloud_init)
+                expect_cloud_init = serializer.load(f.read())
+            self.assertEquals(serializer.load(data), expect_cloud_init)
             return True
 
         self.ec2.run_instances(
@@ -109,7 +108,7 @@
         If the provider bootstrap is run when there is already a running
         bootstrap instance, it will just return the existing machine.
         """
-        state = yaml.dump({"zookeeper-instances": ["i-foobar"]})
+        state = serializer.dump({"zookeeper-instances": ["i-foobar"]})
         self.s3.get_object(self.env_name, "provider-state")
         self.mocker.result(succeed(state))
         self.ec2.describe_instances("i-foobar")

=== modified file 'juju/providers/ec2/tests/test_findzookeeper.py'
--- juju/providers/ec2/tests/test_findzookeeper.py	2011-09-15 18:50:23 +0000
+++ juju/providers/ec2/tests/test_findzookeeper.py	2012-09-15 19:26:18 +0000
@@ -3,9 +3,8 @@
 from txaws.ec2.exception import EC2Error
 from txaws.s3.exception import S3Error
 
-from yaml import dump
-
 from juju.errors import EnvironmentNotFound
+from juju.lib.serializer import dump
 from juju.lib.testing import TestCase
 from juju.providers.ec2.machine import EC2ProviderMachine
 from juju.providers.ec2.tests.common import EC2TestMixin

=== modified file 'juju/providers/ec2/tests/test_launch.py'
--- juju/providers/ec2/tests/test_launch.py	2012-07-18 20:04:16 +0000
+++ juju/providers/ec2/tests/test_launch.py	2012-09-15 19:26:18 +0000
@@ -1,7 +1,5 @@
 import os
 
-import yaml
-
 from twisted.internet.defer import inlineCallbacks, succeed
 
 from txaws.ec2.model import Instance, SecurityGroup
@@ -9,6 +7,7 @@
 from juju.errors import EnvironmentNotFound, ProviderError
 from juju.providers.ec2.machine import EC2ProviderMachine
 
+from juju.lib import serializer
 from juju.lib.testing import TestCase
 from juju.lib.mocker import MATCH
 
@@ -37,8 +36,8 @@
         def verify_user_data(data):
             expect_path = os.path.join(DATA_DIR, cloud_init)
             with open(expect_path) as f:
-                expect_cloud_init = yaml.load(f.read())
-            self.assertEquals(yaml.load(data), expect_cloud_init)
+                expect_cloud_init = serializer.load(f.read())
+            self.assertEquals(serializer.load(data), expect_cloud_init)
             return True
 
         self.ec2.run_instances(

=== modified file 'juju/providers/ec2/tests/test_provider.py'
--- juju/providers/ec2/tests/test_provider.py	2012-08-29 16:36:54 +0000
+++ juju/providers/ec2/tests/test_provider.py	2012-09-15 19:26:18 +0000
@@ -7,6 +7,7 @@
 from juju.providers import ec2 as _mod_provider
 from juju.providers.ec2 import MachineProvider
 from juju.providers.ec2.files import FileStorage
+
 import logging
 
 from .common import EC2TestMixin

=== modified file 'juju/providers/ec2/tests/test_state.py'
--- juju/providers/ec2/tests/test_state.py	2011-09-15 18:50:23 +0000
+++ juju/providers/ec2/tests/test_state.py	2012-09-15 19:26:18 +0000
@@ -1,9 +1,8 @@
-from yaml import dump
-
 from twisted.internet.defer import succeed, fail
 
 from txaws.s3.exception import S3Error
 
+from juju.lib import serializer
 from juju.lib.testing import TestCase
 from juju.providers.ec2.tests.common import EC2TestMixin
 
@@ -20,7 +19,7 @@
         the machine, it will serialize the data to an s3 bucket.
         """
         instances = [self.get_instance("i-foobar", dns_name="x1.example.com")]
-        state = dump(
+        state = serializer.dump(
             {"zookeeper-instances":
              [[i.instance_id, i.dns_name] for i in instances]})
         self.s3.put_object(
@@ -46,7 +45,7 @@
         already exist.
         """
         instances = [self.get_instance("i-foobar", dns_name="x1.example.com")]
-        state = dump(
+        state = serializer.dump(
             {"zookeeper-instances":
              [[i.instance_id, i.dns_name] for i in instances]})
         self.s3.put_object(
@@ -78,7 +77,8 @@
         s3.
         """
         self.s3.get_object(self.env_name, "provider-state")
-        self.mocker.result(succeed(dump({"zookeeper-instances": []})))
+        self.mocker.result(
+            succeed(serializer.dump({"zookeeper-instances": []})))
         self.mocker.replay()
 
         provider = self.get_provider()
@@ -116,7 +116,7 @@
         handles the scenario where there is no saved state.
         """
         self.s3.get_object(self.env_name, "provider-state")
-        self.mocker.result(succeed(dump([])))
+        self.mocker.result(succeed(serializer.dump([])))
         self.mocker.replay()
 
         provider = self.get_provider()

=== modified file 'juju/providers/local/files.py'
--- juju/providers/local/files.py	2012-01-13 00:15:07 +0000
+++ juju/providers/local/files.py	2012-09-15 19:26:18 +0000
@@ -1,13 +1,12 @@
-from getpass import getuser
 import os
 from StringIO import StringIO
-import yaml
 
 from twisted.internet.defer import inlineCallbacks, returnValue
 from twisted.internet.error import ConnectionRefusedError
 from twisted.web.client import getPage
 
 from juju.errors import ProviderError, FileNotFound
+from juju.lib import serializer
 from juju.lib.upstart import UpstartService
 from juju.providers.common.files import FileStorage
 
@@ -79,7 +78,7 @@
         storage = LocalStorage(self._storage_dir)
         yield storage.put(
             SERVER_URL_KEY,
-            StringIO(yaml.safe_dump(
+            StringIO(serializer.dump(
                 {"storage-url": "http://%s:%s/" % (self._host, self._port)})))
 
         self._service.set_command(" ".join(self._service_args))
@@ -112,5 +111,5 @@
 
         if not storage_data or not "storage-url" in storage_data:
             raise ProviderError("Storage not initialized")
-        url = yaml.load(storage_data)["storage-url"]
+        url = serializer.load(storage_data)["storage-url"]
         returnValue(url + key)

=== modified file 'juju/providers/local/tests/test_agent.py'
--- juju/providers/local/tests/test_agent.py	2012-08-03 12:28:29 +0000
+++ juju/providers/local/tests/test_agent.py	2012-09-15 19:26:18 +0000
@@ -1,9 +1,8 @@
 import os
 import tempfile
 import subprocess
-import sys
 
-from twisted.internet.defer import inlineCallbacks, succeed
+from twisted.internet.defer import inlineCallbacks
 
 from juju.lib.lxc.tests.test_lxc import uses_sudo
 from juju.lib.testing import TestCase

=== modified file 'juju/providers/local/tests/test_container.py'
--- juju/providers/local/tests/test_container.py	2011-09-30 03:20:11 +0000
+++ juju/providers/local/tests/test_container.py	2012-09-15 19:26:18 +0000
@@ -3,6 +3,7 @@
 from juju.lib.testing import TestCase
 from juju.lib.lxc import get_containers
 from juju.lib import lxc
+
 lxc_output_sample = "\
 calendarserver\ncaprica\ngemini\nreconnoiter\nvirgo\ncalendarserver\n"
 

=== modified file 'juju/providers/local/tests/test_files.py'
--- juju/providers/local/tests/test_files.py	2012-01-27 17:02:48 +0000
+++ juju/providers/local/tests/test_files.py	2012-09-15 19:26:18 +0000
@@ -2,12 +2,12 @@
 import signal
 from StringIO  import StringIO
 import subprocess
-import yaml
 
 from twisted.internet.defer import inlineCallbacks, succeed
 from twisted.web.client import getPage
 
 from juju.errors import ProviderError, ServiceError
+from juju.lib import serializer
 from juju.lib.lxc.tests.test_lxc import uses_sudo
 from juju.lib.testing import TestCase
 from juju.lib.upstart import UpstartService
@@ -177,7 +177,8 @@
         yield self.assertFailure(self._storage.get_url("abc"), ProviderError)
         self._storage.put(
             SERVER_URL_KEY,
-            StringIO(yaml.dump({"storage-url": "http://localhost/"})))
+            StringIO(
+                serializer.dump({"storage-url": "http://localhost/"})))
 
         self.assertEqual((yield self._storage.get_url("abc")),
                          "http://localhost/abc")

=== modified file 'juju/providers/openstack/tests/test_bootstrap.py'
--- juju/providers/openstack/tests/test_bootstrap.py	2012-07-20 15:45:56 +0000
+++ juju/providers/openstack/tests/test_bootstrap.py	2012-09-15 19:26:18 +0000
@@ -6,12 +6,8 @@
 """
 
 import logging
-import yaml
 
-from juju.lib import (
-    mocker,
-    testing,
-    )
+from juju.lib import mocker, testing, serializer
 
 from juju.providers.openstack.machine import NovaProviderMachine
 from juju.providers.openstack.tests import OpenStackTestMixin
@@ -104,7 +100,7 @@
         self.expect_nova_post("servers/1000/action",
             {"addFloatingIp": {"address": "8.8.8.8"}}, code=202)
         self.expect_swift_put("testing/provider-state",
-            yaml.dump({'zookeeper-instances': ['1000']}))
+            serializer.dump({'zookeeper-instances': ['1000']}))
 
     def _check_machine(self, machine_list):
         [machine] = machine_list
@@ -165,7 +161,7 @@
     def test_existing_machine(self):
         """A preexisting zookeeper instance is returned if present"""
         self.expect_swift_get("testing/provider-state",
-            response=yaml.dump({'zookeeper-instances': ['1000']}))
+            response=serializer.dump({'zookeeper-instances': ['1000']}))
         self.expect_nova_get("servers/1000",
             response={'server': {
                 'id': '1000',
@@ -187,7 +183,7 @@
     def test_existing_machine_missing(self):
         """Bootstrap overwrites existing zookeeper if instance is present"""
         self.expect_swift_get("testing/provider-state",
-            response=yaml.dump({'zookeeper-instances': [3000]}))
+            response=serializer.dump({'zookeeper-instances': [3000]}))
         self.expect_nova_get("servers/3000", code=404,
             response={'itemNotFound':
                 {'message': "The resource could not be found.", 'code': 404}

=== modified file 'juju/providers/openstack/tests/test_launch.py'
--- juju/providers/openstack/tests/test_launch.py	2012-08-24 14:21:57 +0000
+++ juju/providers/openstack/tests/test_launch.py	2012-09-15 19:26:18 +0000
@@ -1,10 +1,10 @@
 """Tests for launching a new server customised for juju using Nova"""
 
-import yaml
 
 from twisted.internet.defer import succeed
 
 from juju import errors
+from juju.lib import serializer
 from juju.lib.mocker import MATCH
 from juju.lib.testing import TestCase
 
@@ -68,7 +68,7 @@
     def match(self, user_data):
         """Check contents of user_data but always match if assertions pass"""
         self._case.assertEqual("#cloud-config", user_data.split("\n", 1)[0])
-        cc = yaml.safe_load(user_data)
+        cc = serializer.load(user_data)
         if self.is_master:
             zookeeper_hosts = "localhost:2181"
         else:

=== modified file 'juju/providers/openstack/tests/test_state.py'
--- juju/providers/openstack/tests/test_state.py	2012-06-18 15:03:50 +0000
+++ juju/providers/openstack/tests/test_state.py	2012-09-15 19:26:18 +0000
@@ -4,8 +4,7 @@
 state handling is a pretty thin layer over the file storage.
 """
 
-import yaml
-
+from juju.lib import serializer
 from juju.lib.testing import TestCase
 from juju.providers.openstack.tests import OpenStackTestMixin
 
@@ -17,7 +16,7 @@
         state = {"zookeeper-instances": [
              [1000, "x1.example.com"],
              ]}
-        self.expect_swift_put("testing/provider-state", yaml.dump(state))
+        self.expect_swift_put("testing/provider-state", serializer.dump(state))
         self.mocker.replay()
         return self.get_provider().save_state(state)
 
@@ -26,7 +25,7 @@
         state = {"zookeeper-instances": [
              [1000, "x1.example.com"],
              ]}
-        state_bytes = yaml.dump(state)
+        state_bytes = serializer.dump(state)
         self.expect_swift_put("testing/provider-state", state_bytes, code=404)
         self.expect_swift_put_container("testing")
         self.expect_swift_put("testing/provider-state", state_bytes)
@@ -37,7 +36,7 @@
         """Loading deserializes yaml from provider-state to a python dict"""
         state = {"zookeeper-instances": []}
         self.expect_swift_get("testing/provider-state",
-            response=yaml.dump(state))
+            response=serializer.dump(state))
         self.mocker.replay()
         deferred = self.get_provider().load_state()
         return deferred.addCallback(self.assertEqual, state)

=== modified file 'juju/providers/orchestra/tests/common.py'
--- juju/providers/orchestra/tests/common.py	2012-04-12 01:01:57 +0000
+++ juju/providers/orchestra/tests/common.py	2012-09-15 19:26:18 +0000
@@ -1,12 +1,13 @@
 from base64 import b64decode
 import os
 from xmlrpclib import Fault
-from yaml import dump, load
+
 
 from twisted.internet.defer import fail, succeed
 from twisted.web.error import Error
 from twisted.web.xmlrpc import Proxy
 
+from juju.lib.serializer import dump, load
 from juju.lib.mocker import ANY, MATCH
 from juju.providers.orchestra import MachineProvider
 

=== modified file 'juju/providers/orchestra/tests/test_bootstrap.py'
--- juju/providers/orchestra/tests/test_bootstrap.py	2012-04-12 01:01:57 +0000
+++ juju/providers/orchestra/tests/test_bootstrap.py	2012-09-15 19:26:18 +0000
@@ -1,9 +1,9 @@
 from xmlrpclib import Fault
-from yaml import dump
 
 from twisted.internet.defer import succeed, inlineCallbacks
 
 from juju.errors import ProviderError
+from juju.lib.serializer import dump
 from juju.lib.testing import TestCase
 from juju.providers.orchestra.machine import OrchestraMachine
 from juju.providers.orchestra.tests.common import OrchestraTestMixin

=== modified file 'juju/providers/orchestra/tests/test_findzookeepers.py'
--- juju/providers/orchestra/tests/test_findzookeepers.py	2011-10-17 13:49:47 +0000
+++ juju/providers/orchestra/tests/test_findzookeepers.py	2012-09-15 19:26:18 +0000
@@ -1,8 +1,7 @@
-from yaml import dump
-
 from twisted.internet.defer import succeed
 
 from juju.errors import EnvironmentNotFound
+from juju.lib.serializer import dump
 from juju.lib.testing import TestCase
 from juju.providers.orchestra import MachineProvider
 from juju.providers.orchestra.machine import OrchestraMachine

=== modified file 'juju/providers/orchestra/tests/test_state.py'
--- juju/providers/orchestra/tests/test_state.py	2011-10-10 07:18:11 +0000
+++ juju/providers/orchestra/tests/test_state.py	2012-09-15 19:26:18 +0000
@@ -1,5 +1,5 @@
-from yaml import dump
 
+from juju.lib.serializer import dump
 from juju.lib.testing import TestCase
 from juju.providers.orchestra import MachineProvider
 

=== modified file 'juju/state/charm.py'
--- juju/state/charm.py	2012-04-01 03:53:48 +0000
+++ juju/state/charm.py	2012-09-15 19:26:18 +0000
@@ -1,4 +1,4 @@
-import yaml
+
 
 from twisted.internet.defer import (
     inlineCallbacks, returnValue, succeed)
@@ -8,7 +8,7 @@
 from juju.charm.config import ConfigOptions
 from juju.charm.metadata import MetaData
 from juju.charm.url import CharmURL
-from juju.lib import under
+from juju.lib import under, serializer
 from juju.state.base import StateBase
 from juju.state.errors import CharmStateNotFound
 
@@ -41,7 +41,7 @@
         #     replacements here. For now this will do, and will
         #     explode reliably in case of conflicts.
         yield self._client.create(
-            _charm_path(charm_id), yaml.safe_dump(charm_data))
+            _charm_path(charm_id), serializer.dump(charm_data))
         charm_state = CharmState(self._client, charm_id, charm_data)
         returnValue(charm_state)
 
@@ -52,7 +52,7 @@
             content, stat = yield self._client.get(_charm_path(charm_id))
         except NoNodeException:
             raise CharmStateNotFound(charm_id)
-        charm_data = yaml.load(content)
+        charm_data = serializer.load(content)
         charm_state = CharmState(self._client, charm_id, charm_data)
         returnValue(charm_state)
 

=== modified file 'juju/state/environment.py'
--- juju/state/environment.py	2012-03-30 08:26:21 +0000
+++ juju/state/environment.py	2012-09-15 19:26:18 +0000
@@ -1,11 +1,12 @@
 import zookeeper
-import yaml
+
 
 from twisted.internet.defer import inlineCallbacks, returnValue
 
 from txzookeeper.utils import retry_change
 
 from juju.environment.config import EnvironmentsConfig
+from juju.lib import serializer
 from juju.state.errors import EnvironmentStateNotFound
 from juju.state.base import StateBase
 
@@ -45,7 +46,7 @@
         """
         data = constraints.data
         data.pop("ubuntu-series", None)
-        return self._force("/constraints", yaml.safe_dump(data))
+        return self._force("/constraints", serializer.dump(data))
 
     @inlineCallbacks
     def get_constraint_set(self):
@@ -66,7 +67,7 @@
         constraint_set = yield self.get_constraint_set()
         try:
             content, stat = yield self._client.get("/constraints")
-            data = yaml.load(content)
+            data = serializer.load(content)
         except zookeeper.NoNodeException:
             data = {}
         returnValue(constraint_set.load(data))
@@ -107,7 +108,7 @@
             content, stat = yield self._client.get(SETTINGS_PATH)
         except zookeeper.NoNodeException:
             returnValue(default)
-        data = yaml.load(content)
+        data = serializer.load(content)
         returnValue(data.get(key, default))
 
     def _set_value(self, key, value):
@@ -116,9 +117,9 @@
             if not old_content:
                 data = {}
             else:
-                data = yaml.load(old_content)
+                data = serializer.load(old_content)
             data[key] = value
-            return yaml.safe_dump(data)
+            return serializer.dump(data)
 
         return retry_change(self._client, SETTINGS_PATH, set_value)
 

=== modified file 'juju/state/hook.py'
--- juju/state/hook.py	2012-04-09 19:40:57 +0000
+++ juju/state/hook.py	2012-09-15 19:26:18 +0000
@@ -6,8 +6,7 @@
 from juju.state.errors import (
     UnitRelationStateNotFound, StateNotFound, RelationBrokenContextError,
     RelationStateNotFound, InvalidRelationIdentity, StateChanged)
-from juju.state.relation import (
-    RelationStateManager, ServiceRelationState, UnitRelationState)
+from juju.state.relation import ServiceRelationState, UnitRelationState
 from juju.state.service import ServiceStateManager, parse_service_name
 from juju.state.utils import YAMLState
 

=== modified file 'juju/state/machine.py'
--- juju/state/machine.py	2012-04-02 23:33:39 +0000
+++ juju/state/machine.py	2012-09-15 19:26:18 +0000
@@ -1,9 +1,9 @@
-import yaml
 import zookeeper
 
 from twisted.internet.defer import inlineCallbacks, returnValue
 
 from juju.errors import ConstraintError
+from juju.lib import serializer
 from juju.state.agent import AgentStateMixin
 from juju.state.environment import EnvironmentStateManager
 from juju.state.errors import MachineStateNotFound, MachineStateInUse
@@ -25,7 +25,7 @@
                 "Unprovisionable machine: incomplete constraints")
         machine_data = {"constraints": constraints.data}
         path = yield self._client.create(
-            "/machines/machine-", yaml.dump(machine_data),
+            "/machines/machine-", serializer.dump(machine_data),
             flags=zookeeper.SEQUENCE)
         _, internal_id = path.rsplit("/", 1)
 

=== modified file 'juju/state/relation.py'
--- juju/state/relation.py	2012-05-15 19:07:47 +0000
+++ juju/state/relation.py	2012-09-15 19:26:18 +0000
@@ -1,7 +1,6 @@
 import logging
 from os.path import basename, dirname
 
-import yaml
 import zookeeper
 
 from twisted.internet.defer import (
@@ -9,6 +8,7 @@
 
 from txzookeeper.utils import retry_change
 
+from juju.lib import serializer
 from juju.state.base import StateBase
 from juju.state.errors import (
     DuplicateEndpoints, IncompatibleEndpoints, RelationAlreadyExists,
@@ -310,7 +310,7 @@
         except zookeeper.NodeExistsException:
             pass
 
-        node_data = yaml.safe_dump(relation_data)
+        node_data = serializer.dump(relation_data)
         role_path = "%s/%s" % (scope_path, relation_data["role"])
 
         yield retry_change(
@@ -346,18 +346,18 @@
         def update_address(content, stat):
             unit_map = None
             if content:
-                unit_map = yaml.load(content)
+                unit_map = serializer.load(content)
             if not unit_map:
                 unit_map = {}
             unit_map["private-address"] = private_address
-            return yaml.safe_dump(unit_map)
+            return serializer.dump(unit_map)
 
         yield retry_change(self._client, settings_path, update_address)
 
         # Update the unit name -> id mapping on the relation node
         def update_unit_mapping(content, stat):
             if content:
-                unit_map = yaml.load(content)
+                unit_map = serializer.load(content)
             else:
                 unit_map = {}
             # If it's already present, we're done, just return the
@@ -366,7 +366,7 @@
             if unit_state.internal_id in unit_map:
                 return content
             unit_map[unit_state.internal_id] = unit_state.unit_name
-            return yaml.dump(unit_map)
+            return serializer.dump(unit_map)
 
         yield retry_change(self._client,
                            "/relations/%s" % self._relation_id,
@@ -481,7 +481,7 @@
         """
         path = yield self.get_settings_path()
         # encode as a YAML string
-        data = yaml.safe_dump(data)
+        data = serializer.dump(data)
 
         yield retry_change(
             self._client, path, lambda content, stat: data)
@@ -724,7 +724,7 @@
             if self._relation_scope == "container":
                 relation_path = dirname(relation_path)
             content, stat = yield self._client.get(relation_path)
-            self._unit_name_map = yaml.load(content)
+            self._unit_name_map = serializer.load(content)
         results = []
         for unit_id_list in unit_ids:
             names = []

=== modified file 'juju/state/security.py'
--- juju/state/security.py	2011-09-15 18:50:23 +0000
+++ juju/state/security.py	2012-09-15 19:26:18 +0000
@@ -1,7 +1,7 @@
 import base64
 import random
 import string
-import yaml
+
 
 from zookeeper import (
     BadArgumentsException, BadVersionException,
@@ -10,6 +10,7 @@
 from twisted.internet.defer import inlineCallbacks, returnValue
 from txzookeeper.client import ZOO_OPEN_ACL_UNSAFE, ZookeeperClient
 
+from juju.lib import serializer
 from juju.state.auth import make_identity, make_ace
 from juju.state.errors import (
     StateNotFound, PrincipalNotFound)
@@ -74,7 +75,7 @@
         except NoNodeException:
             raise StateNotFound("Group does not exist at %r" % self._path)
 
-        credentials = yaml.load(data)
+        credentials = serializer.load(data)
         self._name = credentials["name"]
         self._password = credentials["password"]
 
@@ -108,7 +109,7 @@
         try:
             yield self._client.create(
                 self._path,
-                yaml.safe_dump(dict(name=name, password=password)))
+                serializer.dump(dict(name=name, password=password)))
         except NodeExistsException:
             raise RuntimeError("Group already exists at %r" % self._path)
         self._name = name
@@ -211,7 +212,7 @@
         yield client.add_auth("digest", credentials)
         # Load the otp principal data
         data, stat = yield client.get(path)
-        principal_data = yaml.load(data)
+        principal_data = serializer.load(data)
         # Consume the otp node
         yield client.delete(path)
         returnValue((principal_data["name"], principal_data["password"]))
@@ -237,7 +238,7 @@
 
         self._path = yield self._client.create(
             self._path,
-            yaml.safe_dump(dict(name=name, password=password)),
+            serializer.dump(dict(name=name, password=password)),
             acls=acl,
             flags=SEQUENCE)
 

=== modified file 'juju/state/service.py'
--- juju/state/service.py	2012-04-05 22:27:11 +0000
+++ juju/state/service.py	2012-09-15 19:26:18 +0000
@@ -1,4 +1,3 @@
-import yaml
 import zookeeper
 
 from twisted.internet.defer import (
@@ -7,6 +6,7 @@
 from txzookeeper.utils import retry_change
 
 from juju.charm.url import CharmURL
+from juju.lib import serializer
 from juju.state.agent import AgentStateMixin
 from juju.state.base import log, StateBase
 from juju.state.endpoint import RelationEndpoint
@@ -55,13 +55,14 @@
             "charm": charm_id, "constraints": constraints.data}
         # charm metadata is always decoded into unicode, ensure any
         # serialized state references strings to avoid tying to py runtime.
-        node_data = yaml.safe_dump(service_details)
+        node_data = serializer.dump(service_details)
         path = yield self._client.create("/services/service-", node_data,
                                          flags=zookeeper.SEQUENCE)
         internal_id = path.rsplit("/", 1)[1]
 
         # create a child node for configuration options
-        yield self._client.create("%s/config" % path, yaml.dump({}))
+        yield self._client.create(
+            "%s/config" % path, serializer.dump({}))
 
         def add_service(topology):
             if topology.find_service_with_name(service_name):
@@ -416,7 +417,9 @@
         charm_id = yield self.get_charm_id()
         unit_data = {"charm": charm_id, "constraints": constraints.data}
         path = yield self._client.create(
-            "/units/unit-", yaml.dump(unit_data), flags=zookeeper.SEQUENCE)
+            "/units/unit-",
+            serializer.dump(unit_data),
+            flags=zookeeper.SEQUENCE)
 
         internal_unit_id = path.rsplit("/", 1)[1]
 
@@ -1094,7 +1097,7 @@
         try:
             yield self._client.create(
                 self._hook_debug_path,
-                yaml.safe_dump({"debug_hooks": hook_names}),
+                serializer.dump({"debug_hooks": hook_names}),
                 flags=zookeeper.EPHEMERAL)
         except zookeeper.NodeExistsException:
             raise ServiceUnitDebugAlreadyEnabled(self.unit_name)
@@ -1125,7 +1128,7 @@
         except zookeeper.NoNodeException:
             # We get to the same end state.
             returnValue(None)
-        returnValue(yaml.load(content))
+        returnValue(serializer.load(content))
 
     @inlineCallbacks
     def watch_hook_debug(self, callback, permanent=True):
@@ -1179,12 +1182,12 @@
         def update(content, stat):
             if not content:
                 flags = dict(force=force)
-                return yaml.dump(flags)
+                return serializer.dump(flags)
 
-            flags = yaml.load(content)
+            flags = serializer.load(content)
             if not isinstance(flags, dict):
                 flags = dict(force=force)
-                return yaml.dump(flags)
+                return serializer.dump(flags)
 
             if flags['force'] != force:
                 raise ServiceUnitUpgradeAlreadyEnabled(self.unit_name)
@@ -1205,7 +1208,7 @@
                 returnValue(False)
         except zookeeper.NoNodeException:
             returnValue(False)
-        returnValue(yaml.load(content))
+        returnValue(serializer.load(content))
 
     @inlineCallbacks
     def clear_upgrade_flag(self):
@@ -1282,7 +1285,7 @@
 
         try:
             yield self._client.create(
-                self._unit_resolved_path, yaml.safe_dump({"retry": retry}))
+                self._unit_resolved_path, serializer.dump({"retry": retry}))
         except zookeeper.NodeExistsException:
             raise ServiceUnitResolvedAlreadyEnabled(self.unit_name)
 
@@ -1299,7 +1302,7 @@
         except zookeeper.NoNodeException:
             # Return a default value.
             returnValue(None)
-        returnValue(yaml.load(content))
+        returnValue(serializer.load(content))
 
     @inlineCallbacks
     def clear_resolved(self):
@@ -1392,10 +1395,10 @@
 
         def update_relation_resolved(content, stat):
             if not content:
-                return yaml.safe_dump(relation_map)
+                return serializer.dump(relation_map)
 
-            content = yaml.safe_dump(
-                dict_merge(yaml.load(content), relation_map))
+            content = serializer.dump(
+                dict_merge(serializer.load(content), relation_map))
             return content
 
         try:
@@ -1416,7 +1419,7 @@
                 self._relation_resolved_path)
         except zookeeper.NoNodeException:
             returnValue(None)
-        returnValue(yaml.load(content))
+        returnValue(serializer.load(content))
 
     @inlineCallbacks
     def clear_relation_resolved(self):
@@ -1477,14 +1480,14 @@
             if content is None:
                 data = {}
             else:
-                data = yaml.load(content)
+                data = serializer.load(content)
                 if data is None:
                     data = {}
             open_ports = data.setdefault("open", [])
             port_proto = dict(port=port, proto=proto)
             if port_proto not in open_ports:
                 open_ports.append(port_proto)
-            return yaml.safe_dump(data)
+            return serializer.dump(data)
 
         yield retry_change(self._client, self._ports_path, zk_open_port)
 
@@ -1499,14 +1502,14 @@
             if content is None:
                 data = {}
             else:
-                data = yaml.load(content)
+                data = serializer.load(content)
                 if data is None:
                     data = {}
             open_ports = data.setdefault("open", [])
             port_proto = dict(port=port, proto=proto)
             if port_proto in open_ports:
                 open_ports.remove(port_proto)
-            return yaml.dump(data)
+            return serializer.dump(data)
 
         yield retry_change(
             self._client, self._ports_path, zk_close_port)
@@ -1524,7 +1527,7 @@
             content, stat = yield self._client.get(self._ports_path)
         except zookeeper.NoNodeException:
             returnValue([])
-        data = yaml.load(content)
+        data = serializer.load(content)
         if data is None:
             returnValue(())
         returnValue(data.get("open", ()))

=== modified file 'juju/state/tests/test_charm.py'
--- juju/state/tests/test_charm.py	2012-03-29 08:26:36 +0000
+++ juju/state/tests/test_charm.py	2012-09-15 19:26:18 +0000
@@ -1,7 +1,6 @@
 import os
 import shutil
 
-import yaml
 
 from twisted.internet.defer import inlineCallbacks
 
@@ -10,6 +9,8 @@
 from juju.charm.tests.test_directory import sample_directory
 from juju.charm.tests.test_repository import unbundled_repository
 
+from juju.lib import serializer
+
 from juju.state.charm import CharmStateManager
 from juju.state.errors import CharmStateNotFound
 from juju.state.tests.common import StateTestBase
@@ -44,7 +45,7 @@
         content, stat = yield self.client.get(
             "/charms/local_3a_series_2f_dummy-1")
 
-        charm_data = yaml.load(content)
+        charm_data = serializer.load(content)
         self.assertEquals(charm_data, {
             "metadata": self.charm.metadata.get_serialization_data(),
             "config": self.charm.config.get_serialization_data(),

=== modified file 'juju/state/tests/test_environment.py'
--- juju/state/tests/test_environment.py	2012-03-29 01:37:57 +0000
+++ juju/state/tests/test_environment.py	2012-09-15 19:26:18 +0000
@@ -1,10 +1,9 @@
-import yaml
-
 from twisted.internet.defer import inlineCallbacks, Deferred
 
 from juju.environment.tests.test_config import (
     EnvironmentsConfigTestBase, SAMPLE_ENV)
 from juju.machine.tests.test_constraints import dummy_cs
+from juju.lib import serializer
 from juju.state.errors import EnvironmentStateNotFound
 from juju.state.environment import (
     EnvironmentStateManager, GlobalSettingsStateManager, SETTINGS_PATH)
@@ -38,7 +37,8 @@
 
         serialized = self.config.serialize("myfirstenv")
         content, stat = yield self.client.get("/environment")
-        self.assertEquals(yaml.load(content), yaml.load(serialized))
+        self.assertEquals(serializer.load(content),
+                          serializer.load(serialized))
 
     @inlineCallbacks
     def test_set_config_state_replaces_environment(self):
@@ -53,7 +53,8 @@
 
         serialized = self.config.serialize("myfirstenv")
         content, stat = yield self.client.get("/environment")
-        self.assertEquals(yaml.load(content), yaml.load(serialized))
+        self.assertEquals(serializer.load(content),
+                          serializer.load(serialized))
 
     @inlineCallbacks
     def test_get_config(self):
@@ -65,7 +66,8 @@
         config = yield manager.get_config()
         serialized1 = self.config.serialize("myfirstenv")
         serialized2 = config.serialize("myfirstenv")
-        self.assertEquals(yaml.load(serialized1), yaml.load(serialized2))
+        self.assertEquals(serializer.load(serialized1),
+                          serializer.load(serialized2))
 
     def test_get_config_when_missing(self):
         """
@@ -140,7 +142,7 @@
         yield self.manager.set_provider_type("ec2")
         self.assertEqual((yield self.manager.get_provider_type()), "ec2")
         content, stat = yield self.client.get("/settings")
-        self.assertEqual(yaml.load(content),
+        self.assertEqual(serializer.load(content),
                          {"provider-type": "ec2"})
 
     @inlineCallbacks
@@ -211,7 +213,7 @@
 
         data = dict(x=1, y=2, z=3, moose=u"moon")
         yield self.client.set(
-            SETTINGS_PATH, yaml.safe_dump(data))
+            SETTINGS_PATH, serializer.dump(data))
         value = yield callbacks[1]
         self.assertEqual(value.type_name, "changed")
 

=== modified file 'juju/state/tests/test_hook.py'
--- juju/state/tests/test_hook.py	2012-04-09 19:40:57 +0000
+++ juju/state/tests/test_hook.py	2012-09-15 19:26:18 +0000
@@ -1,7 +1,6 @@
-import yaml
-
 from twisted.internet.defer import inlineCallbacks, returnValue
 from juju.lib.pick import pick_attr
+from juju.lib import serializer
 from juju.lib.testing import TestCase
 
 from juju.state.endpoint import RelationEndpoint
@@ -218,7 +217,7 @@
         self.assertNotEqual(current_data, data)
 
         self.client.set(self.get_unit_settings_path(self.mysql_states),
-                        yaml.dump({"hello": "world"}))
+                        serializer.dump({"hello": "world"}))
         data = yield self.context.get("mysql/0")
         data["abc"] = 1
 
@@ -286,7 +285,7 @@
         content, stat = yield self.client.get(
             self.get_unit_settings_path(self.wordpress_states))
         data["private-address"] = "wordpress-0.example.com"
-        self.assertEqual(yaml.load(content), data)
+        self.assertEqual(serializer.load(content), data)
         self.assertEqual(changes,
                          [AddedItem("abc", 12), AddedItem("bar", "21")])
 
@@ -297,7 +296,7 @@
         yield self.context.set_value("donkey", u"abc")
         data, stat = yield self.client.get(
             self.get_unit_settings_path(self.wordpress_states))
-        self.assertEqual(yaml.load(data),
+        self.assertEqual(serializer.load(data),
                          {"private-address": "wordpress-0.example.com"})
 
         changes = yield self.context.flush()
@@ -305,7 +304,7 @@
             self.get_unit_settings_path(self.wordpress_states))
 
         self.assertEqual(
-            yaml.load(data),
+            serializer.load(data),
             {"zebra": 12, "donkey": "abc",
              "private-address": "wordpress-0.example.com"})
 
@@ -320,14 +319,14 @@
         yield self.client.set(
             self.get_unit_settings_path(
                 self.wordpress_states),
-            yaml.dump({"key": "secret"}))
+            serializer.dump({"key": "secret"}))
 
         yield self.context.delete_value("key")
         changes = yield self.context.flush()
         data, stat = yield self.client.get(
             self.get_unit_settings_path(self.wordpress_states))
 
-        self.assertNotIn("key", yaml.load(data))
+        self.assertNotIn("key", serializer.load(data))
         self.assertEqual(changes, [DeletedItem("key", "secret")])
 
     @inlineCallbacks
@@ -336,14 +335,14 @@
         """
         yield self.client.set(
             self.get_unit_settings_path(self.wordpress_states),
-            yaml.dump({"lantern": "green"}))
+            serializer.dump({"lantern": "green"}))
 
         yield self.context.delete_value("key")
         changes = yield self.context.flush()
         data, stat = yield self.client.get(
             self.get_unit_settings_path(self.wordpress_states))
 
-        self.assertEqual(yaml.load(data), {"lantern": "green"})
+        self.assertEqual(serializer.load(data), {"lantern": "green"})
         self.assertEqual(changes, [])
 
     @inlineCallbacks
@@ -351,12 +350,12 @@
         """Flushing a context which has no writes is a noop."""
         yield self.client.set(
             self.get_unit_settings_path(self.wordpress_states),
-            yaml.dump({"key": "secret"}))
+            serializer.dump({"key": "secret"}))
         changes = yield self.context.flush()
         data, stat = yield self.client.get(
             self.get_unit_settings_path(self.wordpress_states))
 
-        self.assertEqual(yaml.load(data),
+        self.assertEqual(serializer.load(data),
                          {"key": "secret"})
         self.assertEqual(changes, [])
 
@@ -378,7 +377,7 @@
 
         yield self.client.set(
             self.get_unit_settings_path(self.wordpress_states),
-            yaml.dump(data))
+            serializer.dump(data))
 
         # On the context:
         #  - add a new key
@@ -406,7 +405,7 @@
 
         yield self.client.set(
             self.get_unit_settings_path(self.wordpress_states),
-            yaml.dump(data))
+            serializer.dump(data))
 
         changes = yield self.context.flush()
 
@@ -414,7 +413,7 @@
             self.get_unit_settings_path(self.wordpress_states))
 
         self.assertEqual(
-            yaml.load(data),
+            serializer.load(data),
             {"port": 22, "host": "xe2.example.com", "db": 21, "home": "good",
              "tower": "rock", "zoo": "keeper"})
         self.assertEqual(
@@ -430,7 +429,7 @@
         """We can set a value even if we have existing saved settings."""
         yield self.client.set(
             self.get_unit_settings_path(self.wordpress_states),
-            yaml.dump({"key": "secret"}))
+            serializer.dump({"key": "secret"}))
         yield self.context.set_value("magic", "room")
         value = yield self.context.get_value("wordpress/0", "key")
         self.assertEqual(value, "secret")
@@ -675,7 +674,7 @@
     def test_get_self(self):
         """Own settings can be retrieved."""
         self.client.set(self.get_unit_settings_path(self.wordpress_states),
-                        yaml.dump({"hello": "world"}))
+                        serializer.dump({"hello": "world"}))
         data = yield self.context.get(None)
         self.assertEquals(data, {"hello": "world"})
 
@@ -683,7 +682,7 @@
     def test_get_self_by_name(self):
         """Own settings can be retrieved by name."""
         self.client.set(self.get_unit_settings_path(self.wordpress_states),
-                        yaml.dump({"hello": "world"}))
+                        serializer.dump({"hello": "world"}))
         data = yield self.context.get("wordpress/0")
         self.assertEquals(data, {"hello": "world"})
 
@@ -699,7 +698,7 @@
     def test_get_value_self(self):
         """Own settings can be retrieved."""
         self.client.set(self.get_unit_settings_path(self.wordpress_states),
-                        yaml.dump({"hello": "world"}))
+                        serializer.dump({"hello": "world"}))
         self.assertEquals(
             (yield self.context.get_value("wordpress/0", "hello")), "world")
         self.assertEquals(
@@ -847,7 +846,7 @@
             self.unit,
             self.container_unit)
         self.client.set(settings_path,
-                        yaml.dump({"hello": "world"}))
+                        serializer.dump({"hello": "world"}))
         data = yield self.context.get(None)
         self.assertEquals(data, {"hello": "world"})
 

=== modified file 'juju/state/tests/test_machine.py'
--- juju/state/tests/test_machine.py	2012-03-28 00:38:16 +0000
+++ juju/state/tests/test_machine.py	2012-09-15 19:26:18 +0000
@@ -1,11 +1,10 @@
 import functools
 
-import yaml
-
 from twisted.internet.defer import inlineCallbacks, Deferred, returnValue
 
 from juju.charm.tests import local_charm_id
 from juju.errors import ConstraintError
+from juju.lib import serializer
 from juju.machine.tests.test_constraints import (
     dummy_constraints, series_constraints)
 from juju.state.charm import CharmStateManager
@@ -237,7 +236,7 @@
 
         content, stat = yield self.client.get("/machines/machine-0000000000")
         self.assertEquals(
-            yaml.load(content)["provider-machine-id"], "custom-id")
+            serializer.load(content)["provider-machine-id"], "custom-id")
 
     @inlineCallbacks
     def test_set_instance_id_preserves_existing_data(self):
@@ -246,11 +245,11 @@
         """
         machine_state = yield self.add_machine_state()
         yield self.client.set("/machines/machine-0000000000",
-                              yaml.dump({"foo": "bar"}))
+                              serializer.dump({"foo": "bar"}))
         yield machine_state.set_instance_id("custom-id")
 
         content, stat = yield self.client.get("/machines/machine-0000000000")
-        self.assertEquals(yaml.load(content),
+        self.assertEquals(serializer.load(content),
                           {"provider-machine-id": "custom-id",
                            "foo": "bar"})
 
@@ -299,7 +298,7 @@
         """
         machine_state = yield self.add_machine_state()
         yield self.client.set("/machines/machine-0000000000",
-                              yaml.dump({"foo": "bar"}))
+                              serializer.dump({"foo": "bar"}))
 
         instance_id = yield machine_state.get_instance_id()
         self.assertEquals(instance_id, None)

=== modified file 'juju/state/tests/test_relation.py'
--- juju/state/tests/test_relation.py	2012-06-01 22:50:44 +0000
+++ juju/state/tests/test_relation.py	2012-09-15 19:26:18 +0000
@@ -2,15 +2,14 @@
 import os
 import time
 
-import yaml
 import zookeeper
 
-
 from twisted.internet.defer import (
     inlineCallbacks, returnValue, Deferred, fail, succeed)
 
 from juju.charm.directory import CharmDirectory
 from juju.charm.tests import local_charm_id
+from juju.lib import serializer
 from juju.machine.tests.test_constraints import dummy_constraints
 from juju.charm.tests.test_metadata import test_repository_path
 from juju.charm.tests.test_repository import unbundled_repository
@@ -803,14 +802,14 @@
         # Verify the unit mapping
         unit_map_data, stat = yield self.client.get("/relations/%s" % (
             self.relation_state.internal_id))
-        unit_map = yaml.load(unit_map_data)
+        unit_map = serializer.load(unit_map_data)
         self.assertEqual(
             unit_map,
             {unit_state.internal_id: unit_state.unit_name})
 
         content, stat = yield self.client.get(settings_path)
         self.assertEqual(
-            yaml.load(content), {"private-address": "foobar.local"})
+            serializer.load(content), {"private-address": "foobar.local"})
 
     @inlineCallbacks
     def test_add_unit_state_scope_container_relation(self):
@@ -930,7 +929,7 @@
             unit_state.internal_id)
 
         data = {"hello": "world", "private-address": "foobar.local"}
-        yield self.client.create(settings_path, yaml.dump(data))
+        yield self.client.create(settings_path, serializer.dump(data))
 
         yield unit_state.set_private_address("northwest.local")
         yield self.service1_relation.add_unit_state(unit_state)
@@ -939,11 +938,11 @@
 
         # The unit address has been updated to current
         data["private-address"] = "northwest.local"
-        self.assertEqual(node_data, yaml.dump(data))
+        self.assertEqual(node_data, serializer.dump(data))
 
         data, stat = yield self.client.get(
             "/relations/%s" % self.relation_state.internal_id)
-        unit_map = yaml.load(data)
+        unit_map = serializer.load(data)
         self.assertEqual(unit_map,
                          {unit_state.internal_id: unit_state.unit_name})
 
@@ -1094,13 +1093,14 @@
         unit_relation = states["unit_relation"]
 
         data = yield unit_relation.get_data()
-        self.assertEqual(yaml.load(data), {"private-address": None})
+        self.assertEqual(serializer.load(data), {"private-address": None})
 
         unit_relation_path = self.get_unit_settings_path(states)
-        self.client.set(unit_relation_path, yaml.dump(dict(hello="world")))
+        self.client.set(
+            unit_relation_path, serializer.dump(dict(hello="world")))
 
         data = yield unit_relation.get_data()
-        self.assertEqual(data, yaml.dump(dict(hello="world")))
+        self.assertEqual(data, serializer.dump(dict(hello="world")))
 
     @inlineCallbacks
     def test_set_data(self):
@@ -1109,7 +1109,7 @@
         unit_relation_path = self.get_unit_settings_path(states)
         yield unit_relation.set_data(dict(hello="world"))
         data, stat = yield self.client.get(unit_relation_path)
-        self.assertEqual(data, yaml.dump(dict(hello="world")))
+        self.assertEqual(data, serializer.dump(dict(hello="world")))
 
     @inlineCallbacks
     def test_get_relation_role(self):
@@ -1137,7 +1137,7 @@
         yield self.service_manager.remove_service_state(states["service"])
         yield self.assertFailure(
             states["unit_relation"].get_relation_role(), StateChanged)
-        
+
     @inlineCallbacks
     def test_get_related_unit_container(self):
         """Retrieve the container path of the related units."""

=== modified file 'juju/state/tests/test_security.py'
--- juju/state/tests/test_security.py	2012-02-22 09:23:16 +0000
+++ juju/state/tests/test_security.py	2012-09-15 19:26:18 +0000
@@ -1,5 +1,4 @@
 import base64
-import yaml
 import zookeeper
 
 from twisted.internet.defer import inlineCallbacks, succeed
@@ -11,6 +10,7 @@
     ACL, Principal, GroupPrincipal, OTPPrincipal, TokenDatabase,
     SecurityPolicy, SecurityPolicyConnection)
 
+from juju.lib import serializer
 from juju.lib.testing import TestCase
 from juju.tests.common import get_test_zookeeper_address
 
@@ -230,7 +230,7 @@
 
         data, stat = yield self.client.get(otp_path)
 
-        credentials = yaml.load(data)
+        credentials = serializer.load(data)
         self.assertEqual(credentials["name"], "foobar")
         self.assertEqual(credentials["password"], "secret")
 
@@ -291,7 +291,7 @@
         principal = Principal("zebra", "zoo")
         yield self.db.add(principal)
         content, stat = yield self.client.get("/token-test")
-        data = yaml.load(content)
+        data = serializer.load(content)
         self.assertEqual(data, {"zebra": principal.get_token()})
 
     @inlineCallbacks
@@ -300,7 +300,7 @@
         yield self.db.add(principal)
         yield self.db.remove(principal)
         content, stat = yield self.client.get("/token-test")
-        data = yaml.load(content)
+        data = serializer.load(content)
         self.assertEqual(data, {"zebra": principal.get_token()})
 
     @inlineCallbacks

=== modified file 'juju/state/tests/test_service.py'
--- juju/state/tests/test_service.py	2012-07-03 07:30:53 +0000
+++ juju/state/tests/test_service.py	2012-09-15 19:26:18 +0000
@@ -1,7 +1,6 @@
 import os
 import shutil
 
-import yaml
 import zookeeper
 
 from twisted.internet.defer import inlineCallbacks, Deferred, returnValue
@@ -10,6 +9,7 @@
 from juju.charm.directory import CharmDirectory
 from juju.charm.tests import local_charm_id
 from juju.charm.tests.test_metadata import test_repository_path
+from juju.lib import serializer
 from juju.machine.tests.test_constraints import (
         dummy_constraints, dummy_cs, series_constraints)
 from juju.lib.pick import pick_attr
@@ -178,7 +178,7 @@
             "service-0000000000", "service-0000000001"])
 
         content, stat = yield self.client.get("/services/service-0000000000")
-        details = yaml.load(content)
+        details = serializer.load(content)
         self.assertTrue(details)
         self.assertEquals(details.get("charm"), "local:series/dummy-1")
         self.assertFalse(isinstance(details.get("charm"), unicode))
@@ -513,7 +513,7 @@
             # role path
             content, stat = yield self.client.get(role_path)
             self.assertTrue(stat)
-            node_info = yaml.load(content)
+            node_info = serializer.load(content)
 
             self.assertEqual(
                     node_info["name"],
@@ -527,7 +527,7 @@
                             unit_state.internal_id
             content, stat = yield self.client.get(settings_path)
             self.assertTrue(stat)
-            settings_info = yaml.load(content)
+            settings_info = serializer.load(content)
 
             # Verify that private address was set
             # we verify the content elsewhere
@@ -1383,7 +1383,7 @@
         self.assertIdentical(enabled, True)
         content, stat = yield self.client.get(
                 "/units/%s/debug" % unit_state.internal_id)
-        data = yaml.load(content)
+        data = serializer.load(content)
         self.assertEqual(data, {"debug_hooks": ["*"]})
 
     @inlineCallbacks
@@ -1396,7 +1396,7 @@
         self.assertIdentical(enabled, True)
         content, stat = yield self.client.get(
                 "/units/%s/debug" % unit_state.internal_id)
-        data = yaml.load(content)
+        data = serializer.load(content)
         self.assertEqual(data, {"debug_hooks":
                             ["db-relation-broken", "db-relation-changed"]})
 
@@ -1434,7 +1434,7 @@
         self.assertIdentical(enabled, True)
         content, stat = yield self.client.get(
                 "/units/%s/debug" % unit_state.internal_id)
-        data = yaml.load(content)
+        data = serializer.load(content)
         self.assertEqual(data, {"debug_hooks": ["db-relation-changed"]})
 
     @inlineCallbacks
@@ -2495,7 +2495,7 @@
         # The default was never written to storage.
         data, stat = yield self.client.get(
                 "/services/%s/config" % wordpress.internal_id)
-        self.assertEqual(yaml.load(data), {"foo": "bar"})
+        self.assertEqual(serializer.load(data), {"foo": "bar"})
 
     @inlineCallbacks
     def test_get_charm_state(self):
@@ -2761,20 +2761,20 @@
         yield unit_state.open_port(80, "tcp")
         content, stat = yield self.client.get(ports_path)
         self.assertEquals(
-                yaml.load(content),
+                serializer.load(content),
                 {"open": [{"port": 80, "proto": "tcp"}]})
 
         yield unit_state.open_port(53, "udp")
         content, stat = yield self.client.get(ports_path)
         self.assertEquals(
-                yaml.load(content),
+                serializer.load(content),
                 {"open": [{"port": 80, "proto": "tcp"},
                                   {"port": 53, "proto": "udp"}]})
 
         yield unit_state.open_port(443, "tcp")
         content, stat = yield self.client.get(ports_path)
         self.assertEquals(
-                yaml.load(content),
+                serializer.load(content),
                 {"open": [{"port": 80, "proto": "tcp"},
                                   {"port": 53, "proto": "udp"},
                                   {"port": 443, "proto": "tcp"}]})
@@ -2782,7 +2782,7 @@
         yield unit_state.close_port(80, "tcp")
         content, stat = yield self.client.get(ports_path)
         self.assertEquals(
-                yaml.load(content),
+                serializer.load(content),
                 {"open": [{"port": 53, "proto": "udp"},
                                   {"port": 443, "proto": "tcp"}]})
 

=== modified file 'juju/state/tests/test_topology.py'
--- juju/state/tests/test_topology.py	2012-04-12 18:39:20 +0000
+++ juju/state/tests/test_topology.py	2012-09-15 19:26:18 +0000
@@ -1,6 +1,5 @@
-import yaml
-
 from juju.errors import IncompatibleVersion
+from juju.lib import serializer
 from juju.lib.testing import TestCase
 from juju.state.endpoint import RelationEndpoint
 from juju.state.topology import (
@@ -891,7 +890,7 @@
         loaded back.
         """
         empty_data = self.topology.dump()
-        self.assertEquals(yaml.load(empty_data), {"version": VERSION})
+        self.assertEquals(serializer.load(empty_data), {"version": VERSION})
         self.topology.add_machine("m-0")
         machine_data = self.topology.dump()
         self.topology.parse(empty_data)
@@ -902,7 +901,7 @@
     def test_incompatible_version(self):
         """Verify `IncompatibleVersion` raised if using old topology."""
         empty_data = self.topology.dump()
-        self.assertEquals(yaml.load(empty_data), {"version": VERSION})
+        self.assertEquals(serializer.load(empty_data), {"version": VERSION})
         self.topology.add_machine("m-0")
         machine_data = self.topology.dump()
         self.topology.parse(machine_data)
@@ -1265,62 +1264,3 @@
             "r-0", "s-0", "riak", "peer")
         self.assertEqual(self.topology.get_relation_between_endpoints(
             [riak_ep]), "r-0")
-
-
-# Topology migration tests use these. defined at global scope to ease
-# string formatting
-
-TOPOLOGY_V1 = """
-relations:
-  relation-0000000000:
-    - mysql
-    - service-0000000000: {name: db, role: client}
-      service-0000000001: {name: server, role: server}
-version: 1
-"""
-
-TOPOLOGY_V2_EXPECTED = """
-relations:
-  interface: mysql
-  relation-0000000000: {}
-  scope: global
-  services:
-    service-0000000000: {name: db, role: client}
-    service-0000000001: {name: server, role: server}
-version: 2
-"""
-
-
-class TestMigrations(TestCase):
-
-    # DISABLED: We don't do transparent data migrations, till we
-    # have explicit juju core code upgrades, else older agents
-    # will die on new topology formats.
-    def xtest_migration_v1_to_v2(self):
-        """Parse a fragment of a version 1 topology
-
-        Ensure that a version 2 topology is emitted.
-        """
-        topology = InternalTopology()
-        topology.parse(TOPOLOGY_V1)
-        self.assertEqual(topology.get_version(), 2)
-        self.assertEqual(topology.dump().strip(),
-                         TOPOLOGY_V2_EXPECTED.strip())
-
-    def test_migration_v1_to_unknown(self):
-        """Parse a fragment of a version 1 topology
-
-        Ensure that a version 2 topology is emitted.
-        """
-        topology = InternalTopology()
-
-        actual_version = VERSION
-        import juju
-        self.patch(juju.state.topology, "VERSION", actual_version + 1)
-
-        ex = self.assertRaises(IncompatibleVersion,
-                               topology.parse, TOPOLOGY_V1)
-        self.assertEqual(
-            str(ex),
-            "Incompatible juju protocol versions (found 1, want %d)" % (
-                    juju.state.topology.VERSION))

=== modified file 'juju/state/tests/test_utils.py'
--- juju/state/tests/test_utils.py	2012-04-06 14:42:06 +0000
+++ juju/state/tests/test_utils.py	2012-09-15 19:26:18 +0000
@@ -8,8 +8,8 @@
 from twisted.internet import reactor
 from twisted.internet.defer import inlineCallbacks
 from twisted.internet.threads import deferToThread
-import yaml
 
+from juju.lib import serializer
 from juju.lib.testing import TestCase
 from juju.state.base import StateBase
 from juju.state.errors import StateChanged, StateNotFound
@@ -382,7 +382,7 @@
 
         # and a direct look at zk should work as well
         zk_data, stat = yield self.client.get(self.path)
-        zk_data = yaml.load(zk_data)
+        zk_data = serializer.load(zk_data)
         self.assertEqual(zk_data, options)
 
     @inlineCallbacks
@@ -465,7 +465,7 @@
 
         # and a direct look at zk should work as well
         zk_data, stat = yield self.client.get(self.path)
-        zk_data = yaml.load(zk_data)
+        zk_data = serializer.load(zk_data)
         self.assertEqual(zk_data, options)
 
     @inlineCallbacks
@@ -678,13 +678,14 @@
 
     @inlineCallbacks
     def test_get_missing(self):
-        yield self.client.create(self.path, yaml.dump({"foo": "bar"}))
+        yield self.client.create(self.path, serializer.dump({"foo": "bar"}))
         mixee = TestMixee(self.client, self.path)
         self.assertEquals((yield mixee.get()), None)
 
     @inlineCallbacks
     def test_get_exists(self):
-        yield self.client.create(self.path, yaml.dump({"key": "butterfly"}))
+        yield self.client.create(
+            self.path, serializer.dump({"key": "butterfly"}))
         mixee = TestMixee(self.client, self.path)
         self.assertEquals((yield mixee.get()), "butterfly")
 
@@ -694,13 +695,14 @@
         mixee = TestMixee(self.client, self.path)
         yield mixee.set("caterpillar")
         content, _ = yield self.client.get(self.path)
-        self.assertEquals(yaml.load(content), {"key": "caterpillar"})
+        self.assertEquals(serializer.load(content), {"key": "caterpillar"})
 
     @inlineCallbacks
     def test_set_safely(self):
-        yield self.client.create(self.path, yaml.dump({"foo": "bar"}))
+        yield self.client.create(self.path, serializer.dump({"foo": "bar"}))
         mixee = TestMixee(self.client, self.path)
         yield mixee.set("cocoon")
         content, _ = yield self.client.get(self.path)
-        self.assertEquals(yaml.load(content), {"foo": "bar", "key": "cocoon"})
+        self.assertEquals(
+            serializer.load(content), {"foo": "bar", "key": "cocoon"})
 

=== modified file 'juju/state/topology.py'
--- juju/state/topology.py	2012-04-12 18:39:20 +0000
+++ juju/state/topology.py	2012-09-15 19:26:18 +0000
@@ -1,7 +1,7 @@
-import yaml
+
 
 from juju.errors import IncompatibleVersion
-
+from juju.lib import serializer
 
 # The protocol version, which is stored in the /topology node under
 # the "version" key. The protocol version should *only* be updated
@@ -59,7 +59,7 @@
         This string may be provided to the :method:`parse` to
         reestablish the same topology state back.
         """
-        return yaml.safe_dump(self._state)
+        return serializer.dump(self._state)
 
     def parse(self, data):
         """Parse the dumped data provided and restore internal state.
@@ -67,12 +67,11 @@
         The provided data must necessarily have been retrieved by
         calling the :method:`dump`.
         """
-        parsed = yaml.load(data)
+        parsed = serializer.load(data)
         self._state = parsed
         version = self.get_version()
         if version != VERSION:
-            # This will raise if it cannot update the topology.
-            migrate_topology(self)
+            raise IncompatibleVersion(version, VERSION)
 
     def get_version(self):
         return self._state.get("version", 0)
@@ -573,79 +572,3 @@
             else:
                 return relation_id
         return None
-
-
-def _migrate_version_1(topology):
-    """Migrate topology version 1 to version 2.
-
-    This change includes the transition from::
-
-          relations:
-            relation-0000000000:
-            - mysql
-            - service-0000000000: {name: db, role: client}
-              service-0000000001: {name: server, role: server}
-
-    to::
-
-          relations
-              relation-00000001:
-                  interface: name
-                  scope: name
-                  services:
-                    service-00000001: {name: name, role: role}
-                    service-00000002: {name: name, role: role}
-
-    for all relations.
-
-    """
-    version = topology.get_version()
-    if version > 1:
-        return topology
-    elif version != 1:
-        raise IncompatibleVersion(version, VERSION)
-
-    relations = topology._state.get("relations")
-    if relations:
-        new_relations = {}
-        for relation, relation_data in relations.items():
-            new_relations[relation] = {}
-            relation_type, relation_services = relation_data
-            new_relations["interface"] = relation_type
-            new_relations["scope"] = "global"
-            new_relations["services"] = relation_services
-
-        topology._state["relations"] = new_relations
-
-    topology._state["version"] = 2
-    return topology
-
-
-# A dict of version migration plans for VERSION n (where n is the key)
-# to version n + 1. migrate_version will be called until the topology
-# version is equal to VERSION. If no migration plan exists FAIL
-_VERSION_MIGRATION = {
-
-# DISABLED: We can't migrate the topology till we can migrate older
-# code currently running in the env that depends on a previous format.
-# 1: _migrate_version_1
-}
-
-
-def migrate_topology(topology):
-    """Migrate topology version to current.
-
-    Does an in-place (destructive) stepwise modification of topology
-    state from its current version to the VERSION represented in this
-    module.
-    """
-    version = topology.get_version()
-    if version == VERSION:
-        return topology
-
-    current_version = version
-    while current_version < VERSION:
-        if current_version not in _VERSION_MIGRATION:
-            raise IncompatibleVersion(version, VERSION)
-        _VERSION_MIGRATION[current_version](topology)
-        current_version = topology.get_version()

=== modified file 'juju/state/utils.py'
--- juju/state/utils.py	2012-03-09 13:24:58 +0000
+++ juju/state/utils.py	2012-09-15 19:26:18 +0000
@@ -7,9 +7,10 @@
 from twisted.internet.defer import inlineCallbacks, returnValue
 from twisted.internet.threads import deferToThread
 from txzookeeper.utils import retry_change
-import yaml
+
 import zookeeper
 
+from juju.lib import serializer
 from juju.state.errors import StateChanged
 from juju.state.errors import StateNotFound
 
@@ -177,7 +178,7 @@
         self._cache = {}
         try:
             data, stat = yield self._client.get(self._path)
-            data = yaml.load(data)
+            data = serializer.load(data)
             if data:
                 self._pristine_cache = data
                 self._cache = data.copy()
@@ -228,7 +229,7 @@
         def apply_changes(content, stat):
             """Apply the local state to the Zookeeper node state."""
             del changes[:]
-            current = yaml.load(content) if content else {}
+            current = serializer.load(content) if content else {}
             missing = object()
             for key in set(pristine_cache).union(cache):
                 old_value = pristine_cache.get(key, missing)
@@ -244,7 +245,7 @@
                     elif key in current:
                         del current[key]
                         changes.append(DeletedItem(key, old_value))
-            return yaml.safe_dump(current)
+            return serializer.dump(current)
 
         # Apply the change till it takes.
         yield retry_change(self._client, self._path, apply_changes)

=== modified file 'juju/unit/lifecycle.py'
--- juju/unit/lifecycle.py	2012-05-01 00:26:25 +0000
+++ juju/unit/lifecycle.py	2012-09-15 19:26:18 +0000
@@ -2,7 +2,6 @@
 import logging
 import shutil
 import tempfile
-import yaml
 
 from twisted.internet.defer import (
     inlineCallbacks, DeferredLock, DeferredList, returnValue)
@@ -10,6 +9,7 @@
 from juju.errors import CharmUpgradeError
 from juju.hooks.invoker import Invoker
 from juju.hooks.scheduler import HookScheduler
+from juju.lib import serializer
 from juju.state.hook import (
     DepartedRelationHookContext, HookContext, RelationChange)
 from juju.state.errors import StopWatcher, UnitRelationStateNotFound
@@ -493,7 +493,7 @@
         state_dict = {}
         for relation_wf in self._relations.itervalues():
             state_dict.update(relation_wf.get_relation_info())
-        state = yaml.dump(state_dict)
+        state = serializer.dump(state_dict)
         temp_path = self._known_relations_path + "~"
 
         with open(temp_path, "w") as f:
@@ -519,7 +519,7 @@
         relations_by_id = dict((r.internal_relation_id, r) for r in relations)
 
         with open(self._known_relations_path) as f:
-            known_relations = yaml.load(f.read())
+            known_relations = serializer.load(f.read())
 
         for relation_id, relation_info in known_relations.items():
             if relation_id in relations_by_id:

=== modified file 'juju/unit/tests/test_lifecycle.py'
--- juju/unit/tests/test_lifecycle.py	2012-05-04 03:39:27 +0000
+++ juju/unit/tests/test_lifecycle.py	2012-09-15 19:26:18 +0000
@@ -6,7 +6,6 @@
 import stat
 import sys
 
-import yaml
 import zookeeper
 
 from twisted.internet.defer import (inlineCallbacks, Deferred,
@@ -20,6 +19,7 @@
 from juju.errors import CharmInvocationError, CharmError, CharmUpgradeError
 from juju.hooks.invoker import Invoker
 from juju.hooks.executor import HookExecutor
+from juju.lib import serializer
 from juju.machine.tests.test_constraints import series_constraints
 
 from juju.state.endpoint import RelationEndpoint
@@ -1083,7 +1083,8 @@
         self.assertTrue(self.lifecycle.watching)
         self.assertFalse(self.lifecycle.executing)
 
-        rel_states["unit_relation"].set_data(yaml.dump(dict(hello="world")))
+        rel_states["unit_relation"].set_data(
+            serializer.dump(dict(hello="world")))
         # Sleep to give an error a chance.
         yield self.sleep(0.1)
         self.assertFalse(changed_executed.called)

=== modified file 'juju/unit/tests/test_workflow.py'
--- juju/unit/tests/test_workflow.py	2012-04-01 00:48:01 +0000
+++ juju/unit/tests/test_workflow.py	2012-09-15 19:26:18 +0000
@@ -2,7 +2,6 @@
 import itertools
 import logging
 import os
-import yaml
 
 from twisted.internet.defer import inlineCallbacks, returnValue
 
@@ -12,6 +11,7 @@
 
 from juju.charm.directory import CharmDirectory
 from juju.charm.url import CharmURL
+from juju.lib import serializer
 from juju.lib.statemachine import WorkflowState
 from juju.unit.lifecycle import UnitLifecycle, UnitRelationLifecycle
 from juju.unit.workflow import (
@@ -40,10 +40,10 @@
 
         state = open(workflow.state_file_path).read()
         history = open(workflow.state_history_path)
-        zk_state = yaml.load(data)["workflow_state"]
-        returnValue((yaml.load(state),
-                    [yaml.load(r[0]) for r in csv.reader(history)],
-                     yaml.load(zk_state[history_id])))
+        zk_state = serializer.load(data)["workflow_state"]
+        returnValue((serializer.load(state),
+                    [serializer.load(r[0]) for r in csv.reader(history)],
+                     serializer.load(zk_state[history_id])))
 
     @inlineCallbacks
     def assert_history(self, expected, **kwargs):

=== modified file 'juju/unit/workflow.py'
--- juju/unit/workflow.py	2012-03-29 07:52:41 +0000
+++ juju/unit/workflow.py	2012-09-15 19:26:18 +0000
@@ -1,4 +1,3 @@
-import yaml
 import csv
 import os
 import logging
@@ -9,6 +8,7 @@
 from txzookeeper.utils import retry_change
 
 from juju.errors import CharmError, FileNotFound
+from juju.lib import serializer
 from juju.lib.statemachine import (
     WorkflowState, Workflow, Transition, TransitionError)
 
@@ -223,16 +223,16 @@
     @inlineCallbacks
     def _store(self, state_dict):
         """Store the workflow state dictionary in zookeeper."""
-        state_serialized = yaml.safe_dump(state_dict)
+        state_serialized = serializer.dump(state_dict)
 
         def update_state(content, stat):
-            unit_data = yaml.load(content)
+            unit_data = serializer.load(content)
             if not unit_data:
                 unit_data = {}
 
             persistent_workflow = unit_data.setdefault("workflow_state", {})
             persistent_workflow[self.zk_state_id] = state_serialized
-            return yaml.dump(unit_data)
+            return serializer.dump(unit_data)
 
         yield retry_change(self._client, self.zk_state_path, update_state)
         yield super(ZookeeperWorkflowState, self)._store(
@@ -245,8 +245,8 @@
             data, stat = yield self._client.get(self.zk_state_path)
         except NoNodeException:
             returnValue({"state": None})
-        unit_data = yaml.load(data)
-        data = yaml.load(unit_data.get("workflow_state", {}).get(
+        unit_data = serializer.load(data)
+        data = serializer.load(unit_data.get("workflow_state", {}).get(
                 self.zk_state_id, ""))
         returnValue(data)
 
@@ -273,7 +273,7 @@
         Internally the history file is stored a csv, with a new
         row per entry with CSV escaping.
         """
-        state_serialized = yaml.safe_dump(state_dict)
+        state_serialized = serializer.dump(state_dict)
         # State File
         with open(self.state_file_path, "w") as handle:
             handle.write(state_serialized)
@@ -295,7 +295,7 @@
             content = handle.read()
 
         # TODO load ZK state and overwrite with disk state if different?
-        return yaml.load(content)
+        return serializer.load(content)
 
 
 class WorkflowStateClient(ZookeeperWorkflowState):