Code review comment for lp:~rcart/ubuntu/natty/bittornado/fix-420387

I'm not quite sure what happened in this branch, but I uploaded what I extracted as the minimal diff.

--- bittornado-0.3.18//debian/changelog 2010-03-21 22:36:58.000000000 +0100
+++ bittornado/debian/changelog 2011-02-09 10:11:50.020853000 +0100
@@ -1,3 +1,11 @@
+bittornado (0.3.18-10ubuntu1) natty; urgency=low
+
+ * debian/patches/32_use_hashlib_for_sha.patch:
+ - Updated use of deprecated sha module to hashlib. (LP: #420387,
+ Closes: #593653)
+
+ -- Ronny Cardona (Rcart) <email address hidden> Mon, 24 Jan 2011 17:27:47 -0600
+
 bittornado (0.3.18-10) unstable; urgency=low

   * New patch from upstream's CVS to allow torrents that only have an
--- bittornado-0.3.18//debian/control 2010-03-21 22:16:54.000000000 +0100
+++ bittornado/debian/control 2011-02-09 10:11:50.020853000 +0100
@@ -1,7 +1,8 @@
 Source: bittornado
 Section: net
 Priority: optional
-Maintainer: Cameron Dale <email address hidden>
+Maintainer: Ubuntu Developers <email address hidden>
+XSBC-Original-Maintainer: Cameron Dale <email address hidden>
 Build-Depends: debhelper (>= 5.0.37.2)
 Build-Depends-Indep: python, python-support (>= 0.5.4), docbook-to-man
 Standards-Version: 3.8.4
--- bittornado-0.3.18//debian/patches/32_use_hashlib_for_sha.patch 1970-01-01 01:00:00.000000000 +0100
+++ bittornado/debian/patches/32_use_hashlib_for_sha.patch 2011-02-09 10:11:50.020853000 +0100
@@ -0,0 +1,210 @@
+From: Ronny Cardona (Rcart) <email address hidden>
+Description: Updated use of deprecated sha module to hashlib.
+Origin: http://bugs.debian.org/593653#17
+Bug-Debian: http://bugs.debian.org/593653
+Bug-Ubuntu: https://launchpad.net/bugs/420387
+
+Index: bittornado.fix-420387/BitTornado/BT1/makemetafile.py
+===================================================================
+--- bittornado.fix-420387.orig/BitTornado/BT1/makemetafile.py 2011-01-24 17:18:09.183076000 -0600
++++ bittornado.fix-420387/BitTornado/BT1/makemetafile.py 2011-01-24 17:18:55.483076002 -0600
+@@ -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
+Index: bittornado.fix-420387/BitTornado/BT1/Rerequester.py
+===================================================================
+--- bittornado.fix-420387.orig/BitTornado/BT1/Rerequester.py 2011-01-24 17:18:09.083076000 -0600
++++ bittornado.fix-420387/BitTornado/BT1/Rerequester.py 2011-01-24 17:18:55.483076002 -0600
+@@ -12,7 +12,10 @@
+ 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
+Index: bittornado.fix-420387/BitTornado/BT1/StorageWrapper.py
+===================================================================
+--- bittornado.fix-420387.orig/BitTornado/BT1/StorageWrapper.py 2011-01-24 17:18:09.383076000 -0600
++++ bittornado.fix-420387/BitTornado/BT1/StorageWrapper.py 2011-01-24 17:18:55.487076002 -0600
+@@ -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
+Index: bittornado.fix-420387/BitTornado/BT1/track.py
+===================================================================
+--- bittornado.fix-420387.orig/BitTornado/BT1/track.py 2011-01-24 17:18:09.271076000 -0600
++++ bittornado.fix-420387/BitTornado/BT1/track.py 2011-01-24 17:18:55.487076002 -0600
+@@ -23,7 +23,6 @@
+ 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
+Index: bittornado.fix-420387/BitTornado/BTcrypto.py
+===================================================================
+--- bittornado.fix-420387.orig/BitTornado/BTcrypto.py 2011-01-24 17:18:09.491076000 -0600
++++ bittornado.fix-420387/BitTornado/BTcrypto.py 2011-01-24 17:18:55.491076002 -0600
+@@ -10,7 +10,10 @@
+ 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

+Index: bittornado.fix-420387/BitTornado/download_bt1.py
+===================================================================
+--- bittornado.fix-420387.orig/BitTornado/download_bt1.py 2011-01-24 17:18:08.867076000 -0600
++++ bittornado.fix-420387/BitTornado/download_bt1.py 2011-01-24 17:18:55.491076002 -0600
+@@ -24,7 +24,10 @@
+ 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
+Index: bittornado.fix-420387/BitTornado/__init__.py
+===================================================================
+--- bittornado.fix-420387.orig/BitTornado/__init__.py 2011-01-24 17:18:08.771076000 -0600
++++ bittornado.fix-420387/BitTornado/__init__.py 2011-01-24 17:18:55.491076002 -0600
+@@ -5,7 +5,10 @@
+ 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
+Index: bittornado.fix-420387/BitTornado/parsedir.py
+===================================================================
+--- bittornado.fix-420387.orig/BitTornado/parsedir.py 2011-01-24 17:18:08.979076000 -0600
++++ bittornado.fix-420387/BitTornado/parsedir.py 2011-01-24 17:18:55.495076002 -0600
+@@ -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:
+Index: bittornado.fix-420387/btdownloadcurses.py
+===================================================================
+--- bittornado.fix-420387.orig/btdownloadcurses.py 2011-01-24 17:18:09.583076000 -0600
++++ bittornado.fix-420387/btdownloadcurses.py 2011-01-24 17:18:55.495076002 -0600
+@@ -23,7 +23,10 @@
+ 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
+Index: bittornado.fix-420387/btdownloadgui.py
+===================================================================
+--- bittornado.fix-420387.orig/btdownloadgui.py 2011-01-24 17:18:08.579076000 -0600
++++ bittornado.fix-420387/btdownloadgui.py 2011-01-24 17:18:55.503076002 -0600
+@@ -37,7 +37,10 @@
+ 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
+Index: bittornado.fix-420387/btdownloadheadless.py
+===================================================================
+--- bittornado.fix-420387.orig/btdownloadheadless.py 2011-01-24 17:18:08.671076000 -0600
++++ bittornado.fix-420387/btdownloadheadless.py 2011-01-24 17:18:55.519076002 -0600
+@@ -22,7 +22,10 @@
+ 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
+Index: bittornado.fix-420387/btrename.py
+===================================================================
+--- bittornado.fix-420387.orig/btrename.py 2011-01-24 17:18:08.475076000 -0600
++++ bittornado.fix-420387/btrename.py 2011-01-24 17:18:55.523076002 -0600
+@@ -5,7 +5,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]))
+Index: bittornado.fix-420387/btshowmetainfo.py
+===================================================================
+--- bittornado.fix-420387.orig/btshowmetainfo.py 2011-01-24 17:18:08.415076000 -0600
++++ bittornado.fix-420387/btshowmetainfo.py 2011-01-24 17:18:55.523076002 -0600
+@@ -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]))
--- bittornado-0.3.18//debian/patches/series 2010-03-21 21:04:55.000000000 +0100
+++ bittornado/debian/patches/series 2011-02-09 10:11:50.020853000 +0100
@@ -27,3 +27,4 @@
 29_fix_urandom_error.dpatch
 30_announce_list_only_torrents.dpatch
 31_fix_for_compact_reqd_off.dpatch
+32_use_hashlib_for_sha.patch