Package: catfish
Version: 0.3.2-1
Severity: minor
Tags: patch

Remove md5 DeprecationWarning which appears on startup. Patch thanks to 
eskaer_spams...@ngs.ru from LP: #578014

-- System Information:
Debian Release: squeeze/sid
  APT prefers lucid-updates
  APT policy: (500, 'lucid-updates'), (500, 'lucid-security'), (500, 'lucid')
Architecture: i386 (i686)

Kernel: Linux 2.6.32-23-generic (SMP w/2 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages catfish depends on:
ii  python                   2.6.5-0ubuntu1  An interactive high-level object-o
ii  python-glade2            2.17.0-0ubuntu2 GTK+ bindings: Glade support
ii  python-gobject           2.21.1-0ubuntu3 Python bindings for the GObject li
ii  python-gtk2              2.17.0-0ubuntu2 Python bindings for the GTK+ widge
ii  python-support           1.0.4ubuntu1    automated rebuilding support for P

Versions of packages catfish recommends:
ii  python-xdg                 0.18-1ubuntu2 Python library to access freedeskt
pn  slocate                    <none>        (no description available)

Versions of packages catfish suggests:
pn  beagle                   <none>          (no description available)
pn  doodle                   <none>          (no description available)
ii  python-dbus              0.83.0-1ubuntu3 simple interprocess messaging syst
pn  strigi-daemon            <none>          (no description available)
pn  tracker                  <none>          (no description available)

-- no debconf information
diff -ru catfish-0.3.2.orig/catfish.py catfish-0.3.2/catfish.py
--- catfish-0.3.2.orig/catfish.py	2010-07-20 23:14:37.263707525 +0100
+++ catfish-0.3.2/catfish.py	2010-07-20 23:14:48.759682295 +0100
@@ -12,7 +12,7 @@
 import sys
 
 try:
-    import os, stat, time, md5, optparse, subprocess, fnmatch, re
+    import os, stat, time, hashlib, optparse, subprocess, fnmatch, re
     import gobject, pygtk
     pygtk.require('2.0')
     import locale, gettext, gtk, gtk.glade, pango
@@ -713,7 +713,7 @@
     def get_thumbnail(self, path, icon_size=0, mime_type=None):
         """Try to fetch a small thumbnail."""
 
-        md5_hash = md5.new('file://' + path).hexdigest()
+        md5_hash = hashlib.md5('file://' + path).hexdigest()
         filename = '%s%s.png' % (self.folder_thumbnails, md5_hash)
         try:
             return gtk.gdk.pixbuf_new_from_file(filename)

Reply via email to