From 29344cfe5a8f797db474ddf6b80d0021db1141c616171890b7eaf0b92725927e Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Thu, 14 May 2015 13:52:07 +0000 Subject: [PATCH] Accepting request 307131 from home:benoit_monin:branches:devel:languages:python - update to version 0.30.0 - drop fixTestTimeoutIssue.patch: fixed upstream - point the source URL to pypi - add new dependency python-backports.ssl_match_hostname - fix archive name when calling %setup OBS-URL: https://build.opensuse.org/request/show/307131 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-websocket-client?expand=0&rev=6 --- fixTestTimeoutIssue.patch | 35 ---------------------------- python-websocket-client.changes | 41 +++++++++++++++++++++++++++++++++ python-websocket-client.spec | 12 +++++----- websocket-client-0.23.0.tar.gz | 3 --- websocket_client-0.30.0.tar.gz | 3 +++ 5 files changed, 50 insertions(+), 44 deletions(-) delete mode 100644 fixTestTimeoutIssue.patch delete mode 100644 websocket-client-0.23.0.tar.gz create mode 100644 websocket_client-0.30.0.tar.gz diff --git a/fixTestTimeoutIssue.patch b/fixTestTimeoutIssue.patch deleted file mode 100644 index 79e8578..0000000 --- a/fixTestTimeoutIssue.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- websocket/tests/test_websocket.py.orig -+++ websocket/tests/test_websocket.py -@@ -37,6 +37,17 @@ TEST_WITH_INTERNET = False - TEST_SECURE_WS = False - TRACABLE = False - -+def _versionGreater(targetVer): -+ """Returns true if the interpreter version is greater than the given -+ target version""" -+ interpretVer = sys.version.split()[0] -+ for i in range(len(interpretVer)): -+ if interpretVer[i] == '.': -+ continue -+ if int(interpretVer[i]) > int(targetVer[i]): -+ return 1 -+ -+ return None - - def create_mask_key(n): - return "abcd" -@@ -261,8 +272,12 @@ class WebSocketTest(unittest.TestCase): - s.add_packet(six.b("baz")) - with self.assertRaises(ws.WebSocketTimeoutException): - data = sock._recv_strict(9) -- with self.assertRaises(SSLError): -- data = sock._recv_strict(9) -+ if six.PY2 and _versionGreater('2.7.8'): -+ with self.assertRaises(ws.WebSocketTimeoutException): -+ data = sock._recv_strict(9) -+ else: -+ with self.assertRaises(SSLError): -+ data = sock._recv_strict(9) - data = sock._recv_strict(9) - self.assertEqual(data, six.b("foobarbaz")) - with self.assertRaises(ws.WebSocketConnectionClosedException): diff --git a/python-websocket-client.changes b/python-websocket-client.changes index 4a6358c..98d2fec 100644 --- a/python-websocket-client.changes +++ b/python-websocket-client.changes @@ -1,3 +1,44 @@ +------------------------------------------------------------------- +Thu May 14 13:30:06 UTC 2015 - benoit.monin@gmx.fr + +- update to version 0.30.0: + * fixed if client is behind proxy (#169) + * support SNI for python 2.7.9+ and 3.2+ (#172) + * update Host HTTP header by user. (#171) + * fix typo for isEnabledFor (#173) + * can set verify_mode to CERT_NONE when check_hostname is + enabled.(#175) + * make websockets iterable (#178) +- additional changes from version 0.29.0 + * fixed ssl socket bug +- additional changes from version 0.28.0 + * Fix erroneous argument shadowing(#168) +- additional changes from version 0.27.0 + * remove unittest2 requirements for python 2.6 (#156) + * fixed subprotocol case during header validation (#158) + * get response status and headers (#160) + * fix out-of-memory due to fragmentation when recieving a very + large frame(#163) + * fix error if the payload data is nothing.(#166) + * refactoring. +- additional changes from version 0.26.0 + * all WebSocketException provide message string (#152) + * fixed tests fail when not connected to the network (#155) + * Add command line options and handle closed socket to wsdump.py + (#153) +- additional changes from version 0.25.0 + * fixed for Python 2.6(#151) +- additional changes from version 0.24.0 + * Supporting http-basic auth in WebSocketApp (#143) + * fix failer of test.testInternalRecvStrict(#141) + * skip utf8 validation by skip_utf8_validation argument (#137) + * WebsocketProxyException will be raised if we got error about + proxy.(#138) +- drop fixTestTimeoutIssue.patch: fixed upstream +- point the source URL to pypi +- add new dependency python-backports.ssl_match_hostname +- fix archive name when calling %setup + ------------------------------------------------------------------- Wed Feb 11 15:57:53 UTC 2015 - rjschwei@suse.com diff --git a/python-websocket-client.spec b/python-websocket-client.spec index 16dd844..17a31c3 100644 --- a/python-websocket-client.spec +++ b/python-websocket-client.spec @@ -1,7 +1,7 @@ # # spec file for package python-websocket-client # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,17 +17,18 @@ Name: python-websocket-client -Version: 0.23.0 +Version: 0.30.0 Release: 0 Summary: WebSocket client implementation License: LGPL-2.1 Group: Development/Languages/Python Url: https://github.com/liris/websocket-client/releases -Source0: websocket-client-%{version}.tar.gz -Patch0: fixTestTimeoutIssue.patch +Source0: https://pypi.python.org/packages/source/w/websocket-client/websocket_client-%{version}.tar.gz +BuildRequires: python-backports.ssl_match_hostname BuildRequires: python-setuptools BuildRequires: python-six Requires: python +Requires: python-backports.ssl_match_hostname Requires: python-six BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 @@ -53,8 +54,7 @@ Requires: python-websocket-client = %{version} Unit tests for websocket-client %prep -%setup -q -n websocket-client-%{version} -%patch0 +%setup -q -n websocket_client-%{version} %build python setup.py build diff --git a/websocket-client-0.23.0.tar.gz b/websocket-client-0.23.0.tar.gz deleted file mode 100644 index d949544..0000000 --- a/websocket-client-0.23.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ce2519c674a318f1ab0b3db44a5f743615cba1b43708d7abe4741a5f087ea038 -size 195191 diff --git a/websocket_client-0.30.0.tar.gz b/websocket_client-0.30.0.tar.gz new file mode 100644 index 0000000..d61c1a2 --- /dev/null +++ b/websocket_client-0.30.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fab17bc3eb450a28c6edb7a23442a01353712f29240ea76cc9409571e58ed3e5 +size 191852