diff options
| author | Scott Moser <smoser@ubuntu.com> | 2011-10-31 11:48:50 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2011-10-31 11:48:50 -0400 |
| commit | 853649450e74da37f98c0c1e8717cb25db3fab9b (patch) | |
| tree | cdad2b9e736f69e2149a0f72ca772a2d646d3954 | |
| parent | 2ba7c951a0e65e4421093cd785894548c3570da1 (diff) | |
| download | vyos-cloud-init-853649450e74da37f98c0c1e8717cb25db3fab9b.tar.gz vyos-cloud-init-853649450e74da37f98c0c1e8717cb25db3fab9b.zip | |
use hashlib rather than md5 module to avoid deprecation warning.
Thanks: Garrett Holmstrom
LP: #883367
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | cloudinit/UserDataHandler.py | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -2,6 +2,7 @@ - add sample systemd config files [Garrett Holmstrom] - add Fedora support [Garrent Holstrom] (LP: #883286) - fix bug in netinfo.debug_info if no net devices available (LP: #883367) + - use python module hashlib rather than md5 to avoid deprecation warnings. 0.6.2: - fix bug where update was not done unless update was explicitly set. It would not be run if 'upgrade' or packages were set to be installed diff --git a/cloudinit/UserDataHandler.py b/cloudinit/UserDataHandler.py index afd5dd99..982e57f0 100644 --- a/cloudinit/UserDataHandler.py +++ b/cloudinit/UserDataHandler.py @@ -24,7 +24,7 @@ from email import encoders import yaml import cloudinit import cloudinit.util as util -import md5 +import hashlib starts_with_mappings={ '#include' : 'text/x-include-url', @@ -66,7 +66,7 @@ def do_include(str,parts): if line.startswith("#"): continue # urls cannot not have leading or trailing white space - msum = md5.new() + msum = hashlib.md5() msum.update(line.strip()) includeonce_filename = "%s/urlcache/%s" % ( cloudinit.get_ipath_cur("data"), msum.hexdigest()) |