summaryrefslogtreecommitdiffstats
path: root/deluge/metafile.py
diff options
context:
space:
mode:
authorJohn Garland <johnnyg@gmail.com>2009-06-22 14:11:02 +0000
committerJohn Garland <johnnyg@gmail.com>2009-06-22 14:11:02 +0000
commit4b934a07babbdd2414347ee06de200990b5b1f49 (patch)
treec6f9d72d628b8b554711128dca8f6ef908d1d5a7 /deluge/metafile.py
parent206718de08f70985d04b52a586c144cdb66e910d (diff)
downloaddeluge-4b934a07babbdd2414347ee06de200990b5b1f49.tar.gz
deluge-4b934a07babbdd2414347ee06de200990b5b1f49.tar.bz2
deluge-4b934a07babbdd2414347ee06de200990b5b1f49.zip
dummy function now accepts arbitrary number of variables.
metafile uses hashlib instead of sha library.
Diffstat (limited to 'deluge/metafile.py')
-rw-r--r--deluge/metafile.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/deluge/metafile.py b/deluge/metafile.py
index f18849779..bd4ce1a71 100644
--- a/deluge/metafile.py
+++ b/deluge/metafile.py
@@ -20,7 +20,7 @@ import os
import os.path
import sys
import time
-from sha import sha
+from hashlib import sha1 as sha
from deluge.bencode import bencode
from deluge.log import LOG as log
@@ -52,7 +52,7 @@ def decode_from_filesystem(path):
return decoded_path
-def dummy(v):
+def dummy(*v):
pass
def make_meta_file(path, url, piece_length, progress=dummy,