[python-subunit/el6: 3/3] Merge branch 'master' into el6

[Pádraig Brady]

commit 13bd776fdb2911391d2e35f7356026f99896d32d
Merge: 65fbd99 1856e20
Author: Pádraig Brady <P at draigBrady.com>
Date:   Tue Feb 25 03:45:36 2014 +0000

    Merge branch 'master' into el6
    
    Conflicts:
    	python-subunit.spec

 .gitignore             |    1 +
 python-subunit.spec    |   18 ++++++--
 sources                |    2 +-
 unbundle-iso8601.patch |  116 +++++++++++++++++++++++++++++-------------------
 4 files changed, 86 insertions(+), 51 deletions(-)
---
diff --cc python-subunit.spec
index ab574d5,d7b44d8..533a636
--- a/python-subunit.spec
+++ b/python-subunit.spec
@@@ -46,10 -46,11 +46,13 @@@ find python/subunit -name \*.py \! -per
  chmod a+x %{buildroot}%{python_sitelib}/subunit/run.py
  
  %check
 -#TODO: Look into the issue with this test (attribute error with self.option)
 -rm -f python/subunit/tests/test_output_filter.py
 +# python 2.6 doesn't support test discovery
++##TODO: Look into the issue with this test (attribute error with self.option)
++#rm -f python/subunit/tests/test_output_filter.py
++#
 +#PYTHONPATH=%{buildroot}%{python_sitelib} \
 +#%{__python} -m testtools.run discover python/subunit/tests
  
 -PYTHONPATH=%{buildroot}%{python_sitelib} \
 -%{__python} -m testtools.run discover python/subunit/tests
  # Don't distribute the tests
  rm -fr %{buildroot}%{python_sitelib}/subunit/tests