diff options
| author | Ben Howard <ben.howard@canonical.com> | 2012-08-22 16:35:11 -0600 |
|---|---|---|
| committer | Ben Howard <ben.howard@canonical.com> | 2012-08-22 16:35:11 -0600 |
| commit | 6564861d44f843bb4e339db5691021ec7a95c511 (patch) | |
| tree | d3f9f2fbc6e8e01bcab073f77b6f3d673a1da6be /cloudinit/user_data.py | |
| parent | a6752e739a0bb9052585b9b043ce1964bd77bb42 (diff) | |
| parent | 56979d20b9c56c45bfbcaf93bc5f93fa505ece50 (diff) | |
| download | vyos-cloud-init-6564861d44f843bb4e339db5691021ec7a95c511.tar.gz vyos-cloud-init-6564861d44f843bb4e339db5691021ec7a95c511.zip | |
Merge with lp:cloud-init
Diffstat (limited to 'cloudinit/user_data.py')
| -rw-r--r-- | cloudinit/user_data.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/user_data.py b/cloudinit/user_data.py index f5d01818..af98b488 100644 --- a/cloudinit/user_data.py +++ b/cloudinit/user_data.py @@ -23,9 +23,9 @@ import os import email +from email.mime.base import MIMEBase from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText -from email.mime.base import MIMEBase from cloudinit import handlers from cloudinit import log as logging @@ -159,7 +159,7 @@ class UserDataProcessor(object): if isinstance(ent, (str, basestring)): ent = {'content': ent} if not isinstance(ent, (dict)): - # TODO raise? + # TODO(harlowja) raise? continue content = ent.get('content', '') |