Package: bittornado
Version: 0.3.18-10
Severity: normal
This is a more complete patch than the one I sent on 2010-11-25. It
fixes all occurrences of "import sha". This is a Git patch against
the source .deb of bittornado.
commit 2402f939d8e484719a7017e940ae07612d205ec6
Author: Beat Bolli <bbo...@ewanet.ch>
Date: Mon Dec 6 14:10:08 2010 +0100
Import hashlib instead of sha
The sha module is deprecated since Python 2.6. This change is backwards
compatible in that it will fall back to importing sha if importing
hashlib fails.
diff --git a/BitTornado/BT1/Rerequester.py b/BitTornado/BT1/Rerequester.py
index 7071e35..0a27467 100644
--- a/BitTornado/BT1/Rerequester.py
+++ b/BitTornado/BT1/Rerequester.py
@@ -12,7 +12,10 @@ from cStringIO import StringIO
from traceback import print_exc
from socket import error, gethostbyname
from random import shuffle
-from sha import sha
+try:
+ from hashlib import sha1 as sha
+except ImportError:
+ from sha import sha
from time import time
try:
from os import getpid
diff --git a/BitTornado/BT1/StorageWrapper.py b/BitTornado/BT1/StorageWrapper.py
index d1a9715..84f7314 100644
--- a/BitTornado/BT1/StorageWrapper.py
+++ b/BitTornado/BT1/StorageWrapper.py
@@ -2,7 +2,10 @@
# see LICENSE.txt for license information
from BitTornado.bitfield import Bitfield
-from sha import sha
+try:
+ from hashlib import sha1 as sha
+except ImportError:
+ from sha import sha
from BitTornado.clock import clock
from traceback import print_exc
from random import randrange
diff --git a/BitTornado/BT1/makemetafile.py b/BitTornado/BT1/makemetafile.py
index 38e28a5..444b2be 100644
--- a/BitTornado/BT1/makemetafile.py
+++ b/BitTornado/BT1/makemetafile.py
@@ -4,7 +4,10 @@
from os.path import getsize, split, join, abspath, isdir
from os import listdir
-from sha import sha
+try:
+ from hashlib import sha1 as sha
+except ImportError:
+ from sha import sha
from copy import copy
from string import strip
from BitTornado.bencode import bencode
diff --git a/BitTornado/BT1/track.py b/BitTornado/BT1/track.py
index cc369b7..2a45bf0 100644
--- a/BitTornado/BT1/track.py
+++ b/BitTornado/BT1/track.py
@@ -23,7 +23,6 @@ from traceback import print_exc
from time import time, gmtime, strftime, localtime
from BitTornado.clock import clock
from random import shuffle, seed, randrange
-from sha import sha
from types import StringType, IntType, LongType, ListType, DictType
from binascii import b2a_hex, a2b_hex, a2b_base64
from string import lower
diff --git a/BitTornado/BTcrypto.py b/BitTornado/BTcrypto.py
index 4ea3efb..5142f94 100644
--- a/BitTornado/BTcrypto.py
+++ b/BitTornado/BTcrypto.py
@@ -10,14 +10,17 @@ try:
except:
seed()
urandom = lambda x: ''.join([chr(randint(0,255)) for i in xrange(x)])
-from sha import sha
+try:
+ from hashlib import sha1 as sha
+except ImportError:
+ from sha import sha
try:
True
except:
True = 1
False = 0
-
+
try:
from Crypto.Cipher import ARC4
CRYPTO_OK = True
@@ -100,5 +103,3 @@ class Crypto:
def padding(self):
return urandom(randrange(PAD_MAX-16)+16)
-
-
diff --git a/BitTornado/__init__.py b/BitTornado/__init__.py
index 0d8ce63..5478fe4 100644
--- a/BitTornado/__init__.py
+++ b/BitTornado/__init__.py
@@ -5,7 +5,10 @@ version = version_short+' ('+product_name+')'
report_email = 'http://www.debian.org/Bugs/Reporting'
from types import StringType
-from sha import sha
+try:
+ from hashlib import sha1 as sha
+except ImportError:
+ from sha import sha
from time import time, clock
try:
from os import getpid
diff --git a/BitTornado/download_bt1.py b/BitTornado/download_bt1.py
index 15142e3..c0c808b 100644
--- a/BitTornado/download_bt1.py
+++ b/BitTornado/download_bt1.py
@@ -24,7 +24,10 @@ from BT1.Statistics import Statistics
from ConfigDir import ConfigDir
from bencode import bencode, bdecode
from natpunch import UPnP_test
-from sha import sha
+try:
+ from hashlib import sha1 as sha
+except ImportError:
+ from sha import sha
from os import path, makedirs, listdir
from parseargs import parseargs, formatDefinitions, defaultargs
from socket import error as socketerror
diff --git a/BitTornado/parsedir.py b/BitTornado/parsedir.py
index a210bb7..f04a293 100644
--- a/BitTornado/parsedir.py
+++ b/BitTornado/parsedir.py
@@ -3,7 +3,10 @@
from bencode import bencode, bdecode
from BT1.btformats import check_info
from os.path import exists, isfile
-from sha import sha
+try:
+ from hashlib import sha1 as sha
+except ImportError:
+ from sha import sha
import sys, os
try:
diff --git a/btdownloadcurses.py b/btdownloadcurses.py
index b01a0ac..4f9c869 100755
--- a/btdownloadcurses.py
+++ b/btdownloadcurses.py
@@ -23,7 +23,10 @@ from BitTornado.natpunch import UPnP_test
from threading import Event
from os.path import abspath
from signal import signal, SIGWINCH
-from sha import sha
+try:
+ from hashlib import sha1 as sha
+except ImportError:
+ from sha import sha
from sys import argv, exit
import sys
from time import time, strftime
diff --git a/btdownloadgui.py b/btdownloadgui.py
index 8570307..4723010 100755
--- a/btdownloadgui.py
+++ b/btdownloadgui.py
@@ -37,7 +37,10 @@ from BitTornado.clock import clock
from webbrowser import open_new
from traceback import print_exc
from StringIO import StringIO
-from sha import sha
+try:
+ from hashlib import sha1 as sha
+except ImportError:
+ from sha import sha
import re
import sys, os
from BitTornado import version, createPeerID, report_email
diff --git a/btdownloadheadless.py b/btdownloadheadless.py
index d4a85e2..6eefba2 100755
--- a/btdownloadheadless.py
+++ b/btdownloadheadless.py
@@ -22,7 +22,10 @@ from threading import Event
from os.path import abspath
from sys import argv, stdout
import sys
-from sha import sha
+try:
+ from hashlib import sha1 as sha
+except ImportError:
+ from sha import sha
from time import strftime
from BitTornado.clock import clock
from BitTornado import createPeerID, version
diff --git a/btshowmetainfo.py b/btshowmetainfo.py
index 0405378..5c96b96 100755
--- a/btshowmetainfo.py
+++ b/btshowmetainfo.py
@@ -6,7 +6,10 @@
from sys import *
from os.path import *
-from sha import *
+try:
+ from hashlib import sha1 as sha
+except ImportError:
+ from sha import sha
from BitTornado.bencode import *
NAME, EXT = splitext(basename(argv[0]))
-- System Information:
Debian Release: squeeze/sid
APT prefers testing
APT policy: (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.6.32-5-686 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages bittornado depends on:
ii python 2.6.6-3+squeeze1 interactive high-level object-orie
ii python-support 1.0.10 automated rebuilding support for P
Versions of packages bittornado recommends:
ii mime-support 3.48-1 MIME files 'mime.types' & 'mailcap
ii python-crypto 2.1.0-2 cryptographic algorithms and proto
Versions of packages bittornado suggests:
pn bittornado-gui <none> (no description available)
pn python-psyco <none> (no description available)
-- no debconf information
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
