diff options
author | Scott Moser <smoser@ubuntu.com> | 2013-03-19 08:22:30 -0400 |
---|---|---|
committer | Scott Moser <smoser@ubuntu.com> | 2013-03-19 08:22:30 -0400 |
commit | a904de054f7818137c864e0f3ff728b3764cf457 (patch) | |
tree | e28f4807469f2c39554d4353bf11685c03a1b4aa /cloudinit/helpers.py | |
parent | 204e79b93c882e17df63b24f7f682c0dbefb482d (diff) | |
parent | ae0f94c8f39a234d73ab8e2caf24d73439c8b5ee (diff) | |
download | vyos-cloud-init-a904de054f7818137c864e0f3ff728b3764cf457.tar.gz vyos-cloud-init-a904de054f7818137c864e0f3ff728b3764cf457.zip |
merge from trunk at revno 799
Diffstat (limited to 'cloudinit/helpers.py')
-rw-r--r-- | cloudinit/helpers.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cloudinit/helpers.py b/cloudinit/helpers.py index 2077401c..a4e6fb03 100644 --- a/cloudinit/helpers.py +++ b/cloudinit/helpers.py @@ -32,6 +32,7 @@ from cloudinit.settings import (PER_INSTANCE, PER_ALWAYS, PER_ONCE, CFG_ENV_NAME) from cloudinit import log as logging +from cloudinit import type_utils from cloudinit import util LOG = logging.getLogger(__name__) @@ -68,7 +69,7 @@ class FileLock(object): self.fn = fn def __str__(self): - return "<%s using file %r>" % (util.obj_name(self), self.fn) + return "<%s using file %r>" % (type_utils.obj_name(self), self.fn) def canon_sem_name(name): |