diff -u subvertpy-0.6.1/debian/changelog subvertpy-0.6.1/debian/changelog --- subvertpy-0.6.1/debian/changelog +++ subvertpy-0.6.1/debian/changelog @@ -1,3 +1,11 @@ +subvertpy (0.6.1-1ubuntu1) jaunty; urgency=low + + * subvertpy/delta.py: apply revision 2016 from upstream to fix python2.6 + deprecation (LP: #323270) + + + -- Gabriele Monti Fri, 03 Apr 2009 13:33:44 +0200 + subvertpy (0.6.1-1build1) jaunty; urgency=low * No-change rebuild for Python 2.6. only in patch2: unchanged: --- subvertpy-0.6.1.orig/subvertpy/delta.py +++ subvertpy-0.6.1/subvertpy/delta.py @@ -18,7 +18,16 @@ __author__ = "Jelmer Vernooij " __docformat__ = "restructuredText" -import md5 +import sys + +if sys.version_info < (2, 5): + import md5 as _mod_md5 + md5 = _mod_md5.new +else: + from hashlib import ( + md5, + ) + TXDELTA_SOURCE = 0 TXDELTA_TARGET = 1 @@ -58,7 +67,7 @@ def send_stream(stream, handler, block_size=SEND_STREAM_BLOCK_SIZE): - hash = md5.new() + hash = md5() text = stream.read(block_size) while text != "": hash.update(text)