diff options
| author | Scott Moser <smoser@ubuntu.com> | 2012-08-22 14:26:35 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2012-08-22 14:26:35 -0400 |
| commit | 0bc9f3aad55b6b1d50f80ef1b1688c2ceb1c8a84 (patch) | |
| tree | 84509440ef196e5741ece308a7f806d660accbda /cloudinit/user_data.py | |
| parent | 26dd7461ce7ce9a6cba541ece94b802df772168b (diff) | |
| parent | 451e48732ff7885502db2f8296777fa58b670f3b (diff) | |
| download | vyos-cloud-init-0bc9f3aad55b6b1d50f80ef1b1688c2ceb1c8a84.tar.gz vyos-cloud-init-0bc9f3aad55b6b1d50f80ef1b1688c2ceb1c8a84.zip | |
merge from trunk for pep8 fixes
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', '') |