diff --git a/.gitignore b/.gitignore index 8b0c5f2..2cb3a71 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/nose-1.3.0.tar.gz +SOURCES/nose-1.3.7.tar.gz diff --git a/.python-nose.metadata b/.python-nose.metadata index 01c76dc..6e25e36 100644 --- a/.python-nose.metadata +++ b/.python-nose.metadata @@ -1 +1 @@ -bd1bb889e421948ca57595e9e8d52246cb308294 SOURCES/nose-1.3.0.tar.gz +97f2a04c9d43b29ddf4794a1a1d1ba803f1074c6 SOURCES/nose-1.3.7.tar.gz diff --git a/SOURCES/python-nose-readunicode.patch b/SOURCES/python-nose-readunicode.patch new file mode 100644 index 0000000..61d4cd2 --- /dev/null +++ b/SOURCES/python-nose-readunicode.patch @@ -0,0 +1,20 @@ +diff -up nose-1.3.7/nose/plugins/doctests.py.readunicode nose-1.3.7/nose/plugins/doctests.py +--- nose-1.3.7/nose/plugins/doctests.py.readunicode 2015-04-04 02:52:52.000000000 -0600 ++++ nose-1.3.7/nose/plugins/doctests.py 2016-11-15 14:24:54.298239018 -0700 +@@ -49,6 +49,7 @@ test. + """ + from __future__ import generators + ++import codecs + import logging + import os + import sys +@@ -259,7 +260,7 @@ class Doctest(Plugin): + """ + if self.extension and anyp(filename.endswith, self.extension): + name = os.path.basename(filename) +- dh = open(filename) ++ dh = codecs.open(filename, encoding='utf-8') + try: + doc = dh.read() + finally: diff --git a/SOURCES/python-nose-unicode.patch b/SOURCES/python-nose-unicode.patch new file mode 100644 index 0000000..a103da8 --- /dev/null +++ b/SOURCES/python-nose-unicode.patch @@ -0,0 +1,128 @@ +diff -up nose-1.3.7/AUTHORS.unicode nose-1.3.7/AUTHORS +diff -up nose-1.3.7/CHANGELOG.unicode nose-1.3.7/CHANGELOG +diff -up nose-1.3.7/nose/plugins/capture.py.unicode nose-1.3.7/nose/plugins/capture.py +--- nose-1.3.7/nose/plugins/capture.py.unicode 2015-04-04 02:52:52.000000000 -0600 ++++ nose-1.3.7/nose/plugins/capture.py 2016-11-15 13:58:18.713025335 -0700 +@@ -12,6 +12,7 @@ the options ``-s`` or ``--nocapture``. + import logging + import os + import sys ++import traceback + from nose.plugins.base import Plugin + from nose.pyversion import exc_to_unicode, force_unicode + from nose.util import ln +@@ -71,26 +72,56 @@ class Capture(Plugin): + def formatError(self, test, err): + """Add captured output to error report. + """ +- test.capturedOutput = output = self.buffer ++ test.capturedOutput = output = '' ++ output_exc_info = None ++ try: ++ test.capturedOutput = output = self.buffer ++ except UnicodeError: ++ # python2's StringIO.StringIO [1] class has this warning: ++ # ++ # The StringIO object can accept either Unicode or 8-bit strings, ++ # but mixing the two may take some care. If both are used, 8-bit ++ # strings that cannot be interpreted as 7-bit ASCII (that use the ++ # 8th bit) will cause a UnicodeError to be raised when getvalue() ++ # is called. ++ # ++ # This exception handler is a protection against issue #816 [2]. ++ # Capturing the exception info allows us to display it back to the ++ # user. ++ # ++ # [1] ++ # [2] ++ output_exc_info = sys.exc_info() + self._buf = None +- if not output: ++ if (not output) and (not output_exc_info): + # Don't return None as that will prevent other + # formatters from formatting and remove earlier formatters + # formats, instead return the err we got + return err + ec, ev, tb = err +- return (ec, self.addCaptureToErr(ev, output), tb) ++ return (ec, self.addCaptureToErr(ev, output, output_exc_info=output_exc_info), tb) + + def formatFailure(self, test, err): + """Add captured output to failure report. + """ + return self.formatError(test, err) + +- def addCaptureToErr(self, ev, output): ++ def addCaptureToErr(self, ev, output, output_exc_info=None): ++ # If given, output_exc_info should be a 3-tuple from sys.exc_info(), ++ # from an exception raised while trying to get the captured output. + ev = exc_to_unicode(ev) + output = force_unicode(output) +- return u'\n'.join([ev, ln(u'>> begin captured stdout <<'), +- output, ln(u'>> end captured stdout <<')]) ++ error_text = [ev, ln(u'>> begin captured stdout <<'), ++ output, ln(u'>> end captured stdout <<')] ++ if output_exc_info: ++ error_text.extend([u'OUTPUT ERROR: Could not get captured output.', ++ # ++ # ++ u"The test might've printed both 'unicode' strings and non-ASCII 8-bit 'str' strings.", ++ ln(u'>> begin captured stdout exception traceback <<'), ++ u''.join(traceback.format_exception(*output_exc_info)), ++ ln(u'>> end captured stdout exception traceback <<')]) ++ return u'\n'.join(error_text) + + def start(self): + self.stdout.append(sys.stdout) +diff -up nose-1.3.7/unit_tests/test_capture_plugin.py.unicode nose-1.3.7/unit_tests/test_capture_plugin.py +--- nose-1.3.7/unit_tests/test_capture_plugin.py.unicode 2012-09-29 02:18:54.000000000 -0600 ++++ nose-1.3.7/unit_tests/test_capture_plugin.py 2016-11-15 13:58:18.714025330 -0700 +@@ -4,6 +4,12 @@ import unittest + from optparse import OptionParser + from nose.config import Config + from nose.plugins.capture import Capture ++from nose.pyversion import force_unicode ++ ++if sys.version_info[0] == 2: ++ py2 = True ++else: ++ py2 = False + + class TestCapturePlugin(unittest.TestCase): + +@@ -62,6 +68,35 @@ class TestCapturePlugin(unittest.TestCas + c.end() + self.assertEqual(c.buffer, "test 日本\n") + ++ def test_does_not_crash_with_mixed_unicode_and_nonascii_str(self): ++ class Dummy: ++ pass ++ d = Dummy() ++ c = Capture() ++ c.start() ++ printed_nonascii_str = force_unicode("test 日本").encode('utf-8') ++ printed_unicode = force_unicode("Hello") ++ print printed_nonascii_str ++ print printed_unicode ++ try: ++ raise Exception("boom") ++ except: ++ err = sys.exc_info() ++ formatted = c.formatError(d, err) ++ _, fev, _ = formatted ++ ++ if py2: ++ for string in [force_unicode(printed_nonascii_str, encoding='utf-8'), printed_unicode]: ++ assert string not in fev, "Output unexpectedly found in error message" ++ assert d.capturedOutput == '', "capturedOutput unexpectedly non-empty" ++ assert "OUTPUT ERROR" in fev ++ assert "captured stdout exception traceback" in fev ++ assert "UnicodeDecodeError" in fev ++ else: ++ for string in [repr(printed_nonascii_str), printed_unicode]: ++ assert string in fev, "Output not found in error message" ++ assert string in d.capturedOutput, "Output not attached to test" ++ + def test_format_error(self): + class Dummy: + pass diff --git a/SPECS/python-nose.spec b/SPECS/python-nose.spec index 43da831..1425e13 100644 --- a/SPECS/python-nose.spec +++ b/SPECS/python-nose.spec @@ -16,18 +16,25 @@ %global with_docs 1 Name: python-nose -Version: 1.3.0 -Release: 3%{?dist} +Version: 1.3.7 +Release: 1%{?dist} Summary: Discovery-based unittest extension for Python Group: Development/Languages License: LGPLv2+ and Public Domain -URL: http://somethingaboutorange.com/mrl/projects/nose/ +URL: https://nose.readthedocs.org/en/latest/ Source0: http://pypi.python.org/packages/source/n/nose/nose-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch -BuildRequires: python2-devel +# Fix UnicodeDecodeError with captured output +# https://github.com/nose-devs/nose/pull/988 +Patch0: python-nose-unicode.patch +# Allow docutils to read utf-8 source +Patch1: python-nose-readunicode.patch + +BuildArch: noarch +BuildRequires: python2-devel +Provides: python2-%{upstream_name} = %{version}-%{release} %if 0%{?with_python3} BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -35,8 +42,8 @@ BuildRequires: python3-coverage >= 3.4-1 %endif BuildRequires: python-setuptools BuildRequires: dos2unix -BuildRequires: python-coverage >= 3.4-1 -Requires: python-setuptools +BuildRequires: python-coverage >= 3.4-1 +Requires: python-setuptools %description nose extends the test loading and running features of unittest, making @@ -57,8 +64,12 @@ output capture and more. %package docs Summary: Nose Documentation Group: Documentation +%if 0%{?with_docs} BuildRequires: python-sphinx -Requires: python-nose +%endif +Provides: python2-nose-docs = %{version}-%{release} +Requires: python-nose = %{version}-%{release} + %description docs Documentation for Nose @@ -91,6 +102,8 @@ python3 unittests. %prep %setup -q -n %{upstream_name}-%{version} +%patch0 -p1 +%patch1 -p1 dos2unix examples/attrib_plugin.py @@ -99,10 +112,9 @@ rm -rf %{py3dir} cp -a . %{py3dir} %endif # with_python3 -rm doc/*.pyc %build -%{__python} setup.py build +%{__python2} setup.py build %if 0%{?with_python3} pushd %{py3dir} @@ -142,7 +154,7 @@ rm -rf reST/.static reST/.templates %check # Disable test_concurrent_shared as per rhbz#1176288 mv functional_tests/test_multiprocessing/test_concurrent_shared.py{,.notest} -%{__python} selftest.py +%{__python2} selftest.py %if 0%{?with_python3} pushd %{py3dir} @@ -184,6 +196,10 @@ rm -rf %{buildroot} %endif # with_docs %changelog +* Thu Oct 13 2016 Charalampos Stratakis - 1.3.7-1 +- Update to nose 1.3.7 +Resolves: rhbz#1377093 + * Tue Jan 06 2015 Slavek Kabrda - 1.3.0-3 - Disable unstable multiprocessing test. Resolves: rhbz#1176288