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/config/cc_write_files.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/config/cc_write_files.py')
| -rw-r--r-- | cloudinit/config/cc_write_files.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/config/cc_write_files.py b/cloudinit/config/cc_write_files.py index 1bfa4c25..a73d6f4e 100644 --- a/cloudinit/config/cc_write_files.py +++ b/cloudinit/config/cc_write_files.py @@ -19,8 +19,8 @@ import base64 import os -from cloudinit import util from cloudinit.settings import PER_INSTANCE +from cloudinit import util frequency = PER_INSTANCE @@ -46,7 +46,7 @@ def canonicalize_extraction(encoding_type, log): return ['application/x-gzip'] if encoding_type in ['gz+base64', 'gzip+base64', 'gz+b64', 'gzip+b64']: return ['application/base64', 'application/x-gzip'] - # Yaml already encodes binary data as base64 if it is given to the + # Yaml already encodes binary data as base64 if it is given to the # yaml file as binary, so those will be automatically decoded for you. # But the above b64 is just for people that are more 'comfortable' # specifing it manually (which might be a possiblity) |