From 93e69d0cd31200b7b9e96a6998adcb418757ad72 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Thu, 29 Aug 2013 12:57:43 +0300 Subject: Autoremove imported patches from packaging Removed all imported patches from python-coverage.spec and patch files from the packaging dir. --- packaging/python-coverage-3.5.3-pickle.patch | 20 -------------------- packaging/python-coverage.spec | 2 -- 2 files changed, 22 deletions(-) delete mode 100644 packaging/python-coverage-3.5.3-pickle.patch diff --git a/packaging/python-coverage-3.5.3-pickle.patch b/packaging/python-coverage-3.5.3-pickle.patch deleted file mode 100644 index 7f456d2..0000000 --- a/packaging/python-coverage-3.5.3-pickle.patch +++ /dev/null @@ -1,20 +0,0 @@ -# HG changeset patch -# User Ned Batchelder -# 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/packaging/python-coverage.spec b/packaging/python-coverage.spec index d01225f..b406dd9 100644 --- a/packaging/python-coverage.spec +++ b/packaging/python-coverage.spec @@ -17,7 +17,6 @@ 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} @@ -49,7 +48,6 @@ have been executed. %prep %setup -q -n coverage-%{version} -%patch0 -p1 find . -type f -exec chmod 0644 \{\} \; sed -i 's/\r//g' README.txt -- cgit v1.2.3