[python-coverage/f16] Upstream patch to fix traceback using coverage with py2 and py3 in the

[Toshio くらとみ]

commit 48f7eb2726551a0518a839600a9ca89f685df65a
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Wed Oct 10 23:49:06 2012 -0700

    Upstream patch to fix traceback using coverage with py2 and py3 in the
    
      same directory.  https://bugzilla.redhat.com/show_bug.cgi?id=865080

 python-coverage-3.5.3-pickle.patch |   20 ++++++++++++++++++++
 python-coverage.spec               |    9 ++++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/python-coverage-3.5.3-pickle.patch b/python-coverage-3.5.3-pickle.patch
new file mode 100644
index 0000000..7f456d2
--- /dev/null
+++ b/python-coverage-3.5.3-pickle.patch
@@ -0,0 +1,20 @@
+# HG changeset patch
+# User Ned Batchelder <ned at nedbatchelder.com>
+# Date 1349312975 14400
+# Node ID 16020b834643bb8b9953b8d4bcc09691deb549b9
+# Parent  70e174f7312c87101b0b5be7ec7dd1acf7869f12
+Fix #193: The status.dat file written by py2 can't be read by py3
+
+Index: coverage-3.5.1b1/coverage/html.py
+===================================================================
+--- coverage-3.5.1b1.orig/coverage/html.py
++++ coverage-3.5.1b1/coverage/html.py
+@@ -247,7 +247,7 @@ class HtmlStatus(object):
+         try:
+             status_file = os.path.join(directory, self.STATUS_FILE)
+             status = pickle.load(open(status_file, "rb"))
+-        except IOError:
++        except (IOError, ValueError):
+             usable = False
+         else:
+             usable = True
diff --git a/python-coverage.spec b/python-coverage.spec
index 53ad0c0..d01225f 100644
--- a/python-coverage.spec
+++ b/python-coverage.spec
@@ -12,11 +12,12 @@
 Name:           python-coverage
 Summary:        Code coverage testing module for Python
 Version:        3.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        BSD and (MIT or GPLv2)
 Group:          System Environment/Libraries
 URL:            http://nedbatchelder.com/code/modules/coverage.html
 Source0:        http://pypi.python.org/packages/source/c/coverage/coverage-%{version}.tar.gz
+Patch0:         python-coverage-3.5.3-pickle.patch
 BuildRequires:  python-setuptools, python-devel
 Requires:       python-setuptools
 %if 0%{?with_python3}
@@ -48,6 +49,8 @@ have been executed.
 %prep
 %setup -q -n coverage-%{version}
 
+%patch0 -p1
+
 find . -type f -exec chmod 0644 \{\} \;
 sed -i 's/\r//g' README.txt
 
@@ -93,6 +96,10 @@ popd
 
 
 %changelog
+* Wed Oct 10 2012 Toshio Kuratomi <toshio at fedoraproject.org> - 3.5-2
+- Upstream patch to fix traceback using coverage with py2 and py3 in the
+  same directory.  https://bugzilla.redhat.com/show_bug.cgi?id=865080
+
 * Fri Sep  2 2011 Tom Callaway <spot at fedoraproject.org> - 3.5-1
 - update to 3.5