python/python-geventhttpclient
SHA256
14
0
Fork 0
forked from pool/python-geventhttpclient
Code Pull Requests Activity

Accepting request 855615 from home:mcepl:branches:devel:tools:scm

Browse Source 
- We don't need to break Python 2.7

OBS-URL: https://build.opensuse.org/request/show/855615
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-geventhttpclient?expand=0&rev=11
This commit is contained in:
Matej Cepl
2020-12-13 21:28:49 +00:00
committed by Git OBS Bridge
parent 0f2cdc9456
commit ab05b25e9f
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
python-geventhttpclient.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Dec 13 20:26:16 UTC 2020 - Matej Cepl <mcepl@suse.com>
- We don't need to break Python 2.7
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Dec 11 23:08:43 UTC 2020 - Matej Cepl <mcepl@suse.com> Fri Dec 11 23:08:43 UTC 2020 - Matej Cepl <mcepl@suse.com>

3
python-geventhttpclient.spec
View File

@@ -35,6 +35,9 @@ BuildRequires: %{python_module gevent}
BuildRequires: %{python_module pytest} BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools} BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module six} BuildRequires: %{python_module six}
%ifpython2
BuildRequires: %{python_module mock}
%endif
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros
Requires: python-certifi Requires: python-certifi

9
remove_mock.patch
View File

@@ -1,13 +1,16 @@
--- a/src/geventhttpclient/tests/test_ssl.py --- a/src/geventhttpclient/tests/test_ssl.py
+++ b/src/geventhttpclient/tests/test_ssl.py +++ b/src/geventhttpclient/tests/test_ssl.py
@@ -1,5 +1,4 @@ @@ -1,5 +1,7 @@
-import mock -import mock
-from mock import patch, Mock -from mock import patch, Mock
+import unittest.mock as mock +try:
+ import unittest.mock as mock
+except ImportError:
+ import mock
import dpkt.ssl import dpkt.ssl
import six import six
@@ -117,7 +116,7 @@ def _get_sni_sent_from_client(**addition @@ -117,7 +119,7 @@ def _get_sni_sent_from_client(**addition
('127.0.0.1', server_port) ('127.0.0.1', server_port)
) )
with mock.patch( with mock.patch(