From 77b3af5d8dc60dc8b1c0a266516aede6309ef42b Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Sat, 5 Dec 2015 21:04:25 -0700
Subject: [PATCH] Update to 18.7.1. Fixes bug #1287372

---
 .gitignore                     |  1 +
 add-setter-for-test_args.patch | 30 ------------------------------
 python-setuptools.spec         |  8 ++++----
 sources                        |  2 +-
 4 files changed, 6 insertions(+), 35 deletions(-)
 delete mode 100644 add-setter-for-test_args.patch

diff --git a/.gitignore b/.gitignore
index 7680417..36dc7c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@
 /setuptools-18.4.tar.gz
 /setuptools-18.5.tar.gz
 /setuptools-18.6.1.tar.gz
+/setuptools-18.7.1.tar.gz
diff --git a/add-setter-for-test_args.patch b/add-setter-for-test_args.patch
deleted file mode 100644
index 1cd0a6c..0000000
--- a/add-setter-for-test_args.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# HG changeset patch
-# User Robert Kuska <rkuska@redhat.com>
-# Date 1446653216 -3600
-# Node ID f73f1baac78107dd49a5d18b6e43a40baf509d3e
-# Parent  4ce518784af886e6977fa2dbe58359d0fe161d0d
-AttributeError: cant set attribute
-
-with the recent transformation of self.test_args into
-property self.test_args doesnt accept assignation
-when test class is subclassed. This PR adds setter
-for the new property.
-
-diff --git a/setuptools/command/test.py b/setuptools/command/test.py
---- a/setuptools/command/test.py
-+++ b/setuptools/command/test.py
-@@ -80,8 +80,14 @@
- 
-     @property
-     def test_args(self):
-+        if hasattr(self, '_test_args_var'):
-+            return self._test_args_var
-         return list(self._test_args())
- 
-+    @test_args.setter
-+    def test_args(self, value):
-+        self._test_args_var = value
-+
-     def _test_args(self):
-         if self.verbose:
-             yield '--verbose'
diff --git a/python-setuptools.spec b/python-setuptools.spec
index 61b9ba0..739a546 100644
--- a/python-setuptools.spec
+++ b/python-setuptools.spec
@@ -26,7 +26,7 @@
 %endif
 
 Name:           python-setuptools
-Version:        18.6.1
+Version:        18.7.1
 Release:        1%{?dist}
 Summary:        Easily build and distribute Python packages
 
@@ -36,8 +36,6 @@ URL:            https://pypi.python.org/pypi/%{srcname}
 Source0:        https://pypi.python.org/packages/source/s/%{srcname}/%{srcname}-%{version}.tar.gz
 Source1:        psfl.txt
 Source2:        zpl.txt
-# add-setter-for-test_args.patch
-Patch1:         add-setter-for-test_args.patch
 # WIP patch for #1271776
 Patch2:         setuptools-18.5-disable-zip-safe.patch
 
@@ -111,7 +109,6 @@ execute the software that requires pkg_resources.py.
 
 %prep
 %setup -q -n %{srcname}-%{version}
-%patch1 -p1
 
 # We can't remove .egg-info (but it doesn't matter, since it'll be rebuilt):
 #  The problem is that to properly execute setuptools' setup.py,
@@ -221,6 +218,9 @@ popd
 %endif # with_python3
 
 %changelog
+* Fri Dec 04 2015 Kevin Fenzi <kevin@scrye.com> - 18.7.1-1
+- Update to 18.7.1. Fixes bug #1287372
+
 * Wed Nov 25 2015 Kevin Fenzi <kevin@scrye.com> - 18.6.1-1
 - Update to 18.6.1. Fixes bug #1270578
 
diff --git a/sources b/sources
index d5b1a55..4fbb5c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d4797a533b3c7466fd36a791c2de94d2  setuptools-18.6.1.tar.gz
+a0984da9cd8d7b582e1fd7de67dfdbcc  setuptools-18.7.1.tar.gz