Author: johnnyg

Revision: 5400

Log:
        dummy function now accepts arbitrary number of variables.
metafile uses hashlib instead of sha library.

Diff:
Modified: branches/1.1.0_RC/deluge/metafile.py
===================================================================
--- branches/1.1.0_RC/deluge/metafile.py        2009-06-22 07:58:59 UTC (rev 
5399)
+++ branches/1.1.0_RC/deluge/metafile.py        2009-06-22 14:11:02 UTC (rev 
5400)
@@ -20,7 +20,7 @@
 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 @@
 
     return decoded_path
 
-def dummy(v):
+def dummy(*v):
     pass
 
 def make_meta_file(path, url, piece_length, progress=dummy,

Modified: trunk/deluge/metafile.py
===================================================================
--- trunk/deluge/metafile.py    2009-06-22 07:58:59 UTC (rev 5399)
+++ trunk/deluge/metafile.py    2009-06-22 14:11:02 UTC (rev 5400)
@@ -20,7 +20,7 @@
 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 @@
 
     return decoded_path
 
-def dummy(v):
+def dummy(*v):
     pass
 
 def make_meta_file(path, url, piece_length, progress=dummy,



--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"deluge-commit" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to 
[email protected]
For more options, visit this group at 
http://groups.google.com/group/deluge-commit?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to