mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-06 00:18:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some deprecation warnings and imports

Browse source
This commit is contained in:
Andrew Resch 2009-02-20 14:32:28 +00:00
commit d542666f20
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
deluge/common.py
View file

@ -31,9 +31,9 @@ import subprocess
import platform import platform
import sys import sys
if sys.version_info > (2, 6): try:
import json import json
else: except ImportError:
import simplejson as json import simplejson as json
import pkg_resources import pkg_resources

5
deluge/ui/common.py
View file

@ -25,10 +25,11 @@
import os import os
import sys import sys
if sys.version_info > (2, 6): try:
from hashlib import sha1 as sha from hashlib import sha1 as sha
else: except ImportError:
from sha import sha from sha import sha
import urlparse import urlparse
from deluge import bencode from deluge import bencode

2
deluge/ui/gtkui/filtertreeview.py
View file

@ -241,7 +241,7 @@ class FilterTreeView(component.Component):
try: #assume we could get trashed images here.. try: #assume we could get trashed images here..
pix = gtk.gdk.pixbuf_new_from_file_at_size(filename, 16, 16) pix = gtk.gdk.pixbuf_new_from_file_at_size(filename, 16, 16)
except Exception, e: except Exception, e:
log.debug(e.message) log.debug(e)
if not pix: if not pix:
pix = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, True, 8, 16, 16) pix = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, True, 8, 16, 16)

2
deluge/ui/tracker_icons.py
View file

@ -55,7 +55,7 @@ def fetch_url(url, valid_subtypes=None):
if not data: if not data:
raise Exception("No data") raise Exception("No data")
except Exception, e: except Exception, e:
log.debug("%s %s %s" % (url, e, e.message)) log.debug("%s %s" % (url, e))
return None return None
return data return data