diff options
| author | Scott Moser <smoser@ubuntu.com> | 2012-01-12 16:55:17 +0100 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2012-01-12 16:55:17 +0100 |
| commit | 07abdfcfe4c4458fbf05a250f5eff81db151f4cb (patch) | |
| tree | 5fe025ef1502b4eb8da64f1c8f9d391f68eb6c18 /cloudinit/UserDataHandler.py | |
| parent | 6a2031c4dc005d9a0f42b10200b828eee5cf166f (diff) | |
| download | vyos-cloud-init-07abdfcfe4c4458fbf05a250f5eff81db151f4cb.tar.gz vyos-cloud-init-07abdfcfe4c4458fbf05a250f5eff81db151f4cb.zip | |
[PATCH 07/13] Fix pylint warnings W0622 (redefining built-in 'xyz')
From: Juerg Haefliger <juerg.haefliger@hp.com>
Diffstat (limited to 'cloudinit/UserDataHandler.py')
| -rw-r--r-- | cloudinit/UserDataHandler.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cloudinit/UserDataHandler.py b/cloudinit/UserDataHandler.py index 0afe5a18..2d257d12 100644 --- a/cloudinit/UserDataHandler.py +++ b/cloudinit/UserDataHandler.py @@ -37,15 +37,15 @@ starts_with_mappings={ '#cloud-config-archive' : 'text/cloud-config-archive', } -# if 'str' is compressed return decompressed otherwise return it -def decomp_str(str): +# if 'string' is compressed return decompressed otherwise return it +def decomp_str(string): import StringIO import gzip try: - uncomp = gzip.GzipFile(None,"rb",1,StringIO.StringIO(str)).read() + uncomp = gzip.GzipFile(None,"rb",1,StringIO.StringIO(string)).read() return(uncomp) except: - return(str) + return(string) def do_include(content, appendmsg): import os |