From 65997a9209e4c4029c594c693a475d49c18b322a Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Sat, 18 May 2019 13:33:57 -0700
Subject: [PATCH] Update to 1.7.0. Fixes bug #1708882

---
 .gitignore                                    |  1 +
 ...3f1d34d07a001656453823a153ea0c865449.patch | 29 -------------------
 python-pysocks.spec                           |  8 +++--
 sources                                       |  2 +-
 4 files changed, 7 insertions(+), 33 deletions(-)
 delete mode 100644 d74c3f1d34d07a001656453823a153ea0c865449.patch

diff --git a/.gitignore b/.gitignore
index 53c531e..9346083 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /1.5.7.tar.gz
 /PySocks-1.6.7.tar.gz
 /PySocks-1.6.8.tar.gz
+/PySocks-1.7.0.tar.gz
diff --git a/d74c3f1d34d07a001656453823a153ea0c865449.patch b/d74c3f1d34d07a001656453823a153ea0c865449.patch
deleted file mode 100644
index 604d932..0000000
--- a/d74c3f1d34d07a001656453823a153ea0c865449.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d74c3f1d34d07a001656453823a153ea0c865449 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Fri, 29 Jun 2018 18:03:21 +0200
-Subject: [PATCH] Avoid DeprecationWarning
-
-Using or importing the ABCs from 'collections' instead of from
-'collections.abc' is deprecated, and in 3.8 it will stop working.
-
-Preserves Python 2 compatibility.
----
- socks.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/socks.py b/socks.py
-index 1b55295..80b6876 100644
---- a/socks.py
-+++ b/socks.py
-@@ -55,7 +55,10 @@
- """
- 
- from base64 import b64encode
--from collections import Callable
-+try:
-+    from collections.abc import Callable
-+except ImportError:
-+    from collections import Callable
- from errno import EOPNOTSUPP, EINVAL, EAGAIN
- import functools
- from io import BytesIO
diff --git a/python-pysocks.spec b/python-pysocks.spec
index 3d0588e..c54a0b3 100644
--- a/python-pysocks.spec
+++ b/python-pysocks.spec
@@ -23,15 +23,14 @@
 %global sum         A Python SOCKS client module
 
 Name:               python-%{modname}
-Version:            1.6.8
-Release:            7%{?dist}
+Version:            1.7.0
+Release:            1%{?dist}
 Summary:            %{sum}
 
 License:            BSD
 URL:                https://github.com/Anorov/%{pypi_name}
 Source0:            %pypi_source
 BuildArch:          noarch
-Patch0:             https://github.com/Anorov/PySocks/commit/d74c3f1d34d07a001656453823a153ea0c865449.patch
 
 %global _description \
 A fork of SocksiPy with bug fixes and extra features.\
@@ -171,6 +170,9 @@ rm -rfv test/bin
 
 
 %changelog
+* Sat May 18 2019 Kevin Fenzi <kevin@scrye.com> - 1.7.0-1
+- Update to 1.7.0. Fixes bug #1708882
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.8-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index fbc166d..8d5199a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (PySocks-1.6.8.tar.gz) = 9b544cf11464142a5f347cd5688b48422249363a425ccf3887117152f2f1969713674c4bba714242432ae85f3d62e03edeb9cb7b73ebd225ed3b47b3da6896d5
+SHA512 (PySocks-1.7.0.tar.gz) = cc08ecbf65b59b6c4d4a24e01490dba19d93f2deb2860a49c4fc5679a9ceaba1860f05faaf8e299cf195e184a844f11989595e5046b07e2b30f9f3c682950e52