diff options
| author | Aleksey Lim <alsroot@member.fsf.org> | 2009-07-11 13:12:24 (GMT) |
|---|---|---|
| committer | Aleksey Lim <alsroot@member.fsf.org> | 2009-07-11 13:12:24 (GMT) |
| commit | 0facb18accc6672a85894dd2e3c20452a186e881 (patch) | |
| tree | 578972a5cf1c5f5196174751c7515c6b20edbf09 /src | |
| parent | bffb54971fc31644baa1e3f98f9769b5158929b5 (diff) | |
md5 and sha module will be deprecated in python 2.6 #266
Diffstat (limited to 'src')
| -rw-r--r-- | src/jarabe/desktop/keydialog.py | 4 | ||||
| -rw-r--r-- | src/jarabe/desktop/meshbox.py | 4 | ||||
| -rw-r--r-- | src/jarabe/model/owner.py | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/jarabe/desktop/keydialog.py b/src/jarabe/desktop/keydialog.py index f5995e6..93f07c4 100644 --- a/src/jarabe/desktop/keydialog.py +++ b/src/jarabe/desktop/keydialog.py @@ -14,7 +14,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -import md5 +import hashlib from gettext import gettext as _ import gtk @@ -53,7 +53,7 @@ def hash_passphrase(passphrase): elif len(passphrase) < 64: while len(passphrase) < 64: passphrase += passphrase[:64 - len(passphrase)] - passphrase = md5.new(passphrase).digest() + passphrase = hashlib.md5(passphrase).digest() return string_to_hex(passphrase)[:26] class CanceledKeyRequestError(dbus.DBusException): diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py index abbdaa6..8a1d569 100644 --- a/src/jarabe/desktop/meshbox.py +++ b/src/jarabe/desktop/meshbox.py @@ -16,7 +16,7 @@ from gettext import gettext as _ import logging -import sha +import hashlib import dbus import hippo @@ -169,7 +169,7 @@ class AccessPointView(CanvasPulsingIcon): if 'Mode' in properties: self._mode = properties['Mode'] - sh = sha.new() + sh = hashlib.sha1() data = self._name + hex(self._flags) sh.update(data) h = hash(sh.digest()) diff --git a/src/jarabe/model/owner.py b/src/jarabe/model/owner.py index bdfd9a8..2075f08 100644 --- a/src/jarabe/model/owner.py +++ b/src/jarabe/model/owner.py @@ -62,8 +62,8 @@ class Owner(gobject.GObject): raise RuntimeError("invalid buddy icon") # Get the icon's hash - import md5 - digest = md5.new(self._icon).digest() + import hashlib + digest = hashlib.md5(self._icon).digest() self._icon_hash = util.printable_hash(digest) self._pservice = presenceservice.get_instance() |