tags 595860 + pending thanks Dear maintainer,
I've prepared an NMU for solfege (versioned as 3.16.4-1.1) and uploaded it to DELAYED/1. Regards.
diff -Nru solfege-3.16.4/debian/changelog solfege-3.16.4/debian/changelog --- solfege-3.16.4/debian/changelog 2010-07-24 12:37:04.000000000 +0200 +++ solfege-3.16.4/debian/changelog 2010-09-19 13:38:34.000000000 +0200 @@ -1,3 +1,13 @@ +solfege (3.16.4-1.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches/test-py-displayhook.patch + - redefine sys.__displayhook__ in test.py, to avoid to overwrite the '_' + upstream function; thanks to Lucas Nussbaum for the report ant to Michael + Schutte for the patch; Closes: #595860 + + -- Sandro Tosi <mo...@debian.org> Sun, 19 Sep 2010 13:38:30 +0200 + solfege (3.16.4-1) unstable; urgency=low * New upstream release diff -Nru solfege-3.16.4/debian/patches/series solfege-3.16.4/debian/patches/series --- solfege-3.16.4/debian/patches/series 2010-03-28 22:23:10.000000000 +0200 +++ solfege-3.16.4/debian/patches/series 2010-09-19 12:31:42.000000000 +0200 @@ -2,3 +2,4 @@ xsltproc-nonet.patch xmllint-nonet.patch test-py-xvfb-run.patch +test-py-displayhook.patch diff -Nru solfege-3.16.4/debian/patches/test-py-displayhook.patch solfege-3.16.4/debian/patches/test-py-displayhook.patch --- solfege-3.16.4/debian/patches/test-py-displayhook.patch 1970-01-01 01:00:00.000000000 +0100 +++ solfege-3.16.4/debian/patches/test-py-displayhook.patch 2010-09-19 12:23:20.000000000 +0200 @@ -0,0 +1,27 @@ +Subject: Set sys.__displayhook__ = sys.displayhook in test.py +From: Michael Schutte <mi...@uiae.at> +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=595860 +Forwarded: not-needed + +doctest from Python >= 2.6 resets sys.displayhook whenever a test is +run. The default displayhook sets _ to the evaluation result of the +last line, but this messes with the global definition of _ in +solfege.i18n. + +This patch implements an ugly fix by redefining sys.__displayhook__ in +test.py. Upstream has already fixed the problem properly by avoiding +doctest in the first place. + +Index: solfege-3.16.4/test.py +=================================================================== +--- solfege-3.16.4.orig/test.py 2010-09-18 19:28:26.000000000 +0200 ++++ solfege-3.16.4/test.py 2010-09-18 19:28:33.000000000 +0200 +@@ -19,7 +19,7 @@ + else: + print s + +-sys.displayhook = f ++sys.__displayhook__ = sys.displayhook = f + + from solfege import testlib + import solfege.i18n
