From 9993abd5b6242491451e0b80d6b7ec883029386e2445a59246beea22c437d64b Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Thu, 13 Jun 2013 08:54:52 +0000 Subject: [PATCH] Accepting request 178495 from home:dirkmueller:branches:devel:languages:python MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - update to 1.51: * Add a MANIFEST.in file, patch by Daniel Widerin. * Client() now takes a "check_keys" option, which defaults to True. If False, it disables the checking of keys to ensure they have acceptable size and are composed of non-control characters. Suggested by Ben Hoyt. * Converting control character checking of keys based on performance testing of alternatives by Ben Hoyt. * Converted unicode tests from using u'', patch from Eren Güve. * Included license file (pull request by "Philippe" pombredanne). * Doing a "set" after server goes away, raised AttributeError: 'NoneType' object has no attribute 'sendall'. Patch by Ken Lalonde * incr/decr return None instead of 0 on server connection failure. Suggested by Ivan Virabyan * Supports IPv6 connections using: "inet6:[fd00::32:19f7]:11000". Patch by Romain Courteaud - python-memcached-ipv6-and-or.patch: remove. Solved differently upstream OBS-URL: https://build.opensuse.org/request/show/178495 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-python-memcached?expand=0&rev=10 --- python-memcached-1.48.tar.gz | 3 --- python-memcached-1.51.tar.gz | 3 +++ python-memcached-ipv6-and-or.patch | 39 ------------------------------ python-python-memcached.changes | 21 ++++++++++++++++ python-python-memcached.spec | 10 +++----- 5 files changed, 28 insertions(+), 48 deletions(-) delete mode 100644 python-memcached-1.48.tar.gz create mode 100644 python-memcached-1.51.tar.gz delete mode 100644 python-memcached-ipv6-and-or.patch diff --git a/python-memcached-1.48.tar.gz b/python-memcached-1.48.tar.gz deleted file mode 100644 index da71b3c..0000000 --- a/python-memcached-1.48.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b0bd09a717dd6d9ececb86cd28b041954f33d2022b388ddd113441feea3c19a6 -size 13025 diff --git a/python-memcached-1.51.tar.gz b/python-memcached-1.51.tar.gz new file mode 100644 index 0000000..0e70b1c --- /dev/null +++ b/python-memcached-1.51.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20bc7e07b0aedbb97447940702f1900ed222a7f9bd6b2784a9d5b314252cd539 +size 20176 diff --git a/python-memcached-ipv6-and-or.patch b/python-memcached-ipv6-and-or.patch deleted file mode 100644 index a6b079f..0000000 --- a/python-memcached-ipv6-and-or.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -ruN a/memcache.py b/memcache.py ---- a/memcache.py 2011-11-28 02:17:32.000000000 +0100 -+++ b/memcache.py 2013-04-26 11:18:47.765452711 +0200 -@@ -1042,6 +1042,9 @@ - # parse the connection string - m = re.match(r'^(?Punix):(?P.*)$', host) - if not m: -+ m = re.match(r'^(?Pinet6):' -+ r'\[(?P[^\[\]]+)\](:(?P[0-9]+))?$', host) -+ if not m: - m = re.match(r'^(?Pinet):' - r'(?P[^:]+)(:(?P[0-9]+))?$', host) - if not m: m = re.match(r'^(?P[^:]+)(:(?P[0-9]+))?$', host) -@@ -1052,10 +1055,15 @@ - if hostData.get('proto') == 'unix': - self.family = socket.AF_UNIX - self.address = hostData['path'] -+ elif hostData.get('proto') == 'inet6': -+ self.family = socket.AF_INET6 -+ self.ip = hostData['host'] -+ self.port = int(hostData.get('port') or 11211) -+ self.address = ( self.ip, self.port ) - else: - self.family = socket.AF_INET - self.ip = hostData['host'] -- self.port = int(hostData.get('port', 11211)) -+ self.port = int(hostData.get('port') or 11211) - self.address = ( self.ip, self.port ) - - self.deaduntil = 0 -@@ -1158,6 +1166,8 @@ - - if self.family == socket.AF_INET: - return "inet:%s:%d%s" % (self.address[0], self.address[1], d) -+ elif self.family == socket.AF_INET6: -+ return "inet6:[%s]:%d%s" % (self.address[0], self.address[1], d) - else: - return "unix:%s%s" % (self.address, d) - diff --git a/python-python-memcached.changes b/python-python-memcached.changes index 4cb5d2f..bc43ebf 100644 --- a/python-python-memcached.changes +++ b/python-python-memcached.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Mon May 27 10:30:36 UTC 2013 - dmueller@suse.com + +- update to 1.51: + * Add a MANIFEST.in file, patch by Daniel Widerin. + * Client() now takes a "check_keys" option, which defaults to True. + If False, it disables the checking of keys to ensure they have + acceptable size and are composed of non-control characters. + Suggested by Ben Hoyt. + * Converting control character checking of keys based on performance + testing of alternatives by Ben Hoyt. + * Converted unicode tests from using u'', patch from Eren Güve. + * Included license file (pull request by "Philippe" pombredanne). + * Doing a "set" after server goes away, raised AttributeError: + 'NoneType' object has no attribute 'sendall'. Patch by Ken Lalonde + * incr/decr return None instead of 0 on server connection failure. + Suggested by Ivan Virabyan + * Supports IPv6 connections using: "inet6:[fd00::32:19f7]:11000". + Patch by Romain Courteaud +- python-memcached-ipv6-and-or.patch: remove. Solved differently upstream + ------------------------------------------------------------------- Fri Apr 26 09:20:00 UTC 2013 - speilicke@suse.com diff --git a/python-python-memcached.spec b/python-python-memcached.spec index f6c0ee6..54b7853 100644 --- a/python-python-memcached.spec +++ b/python-python-memcached.spec @@ -17,24 +17,23 @@ Name: python-python-memcached -Version: 1.48 +Version: 1.51 Release: 0 Url: http://www.tummy.com/Community/software/python-memcached/ Summary: Pure python memcached client License: Python-2.0 Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/p/python-memcached/python-memcached-%{version}.tar.gz -Patch0: python-memcached-ipv6-and-or.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-distribute -Provides: python-memcached = %{version} -Obsoletes: python-memcached < %{version} %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else BuildArch: noarch %endif +Provides: python-memcached = %{version} +Obsoletes: python-memcached < %{version} %description This package was originally written by Evan Martin of Danga. @@ -47,7 +46,6 @@ for more information. %prep %setup -q -n python-memcached-%{version} -%patch0 -p1 %build python setup.py build @@ -57,7 +55,7 @@ python setup.py install --prefix=%{_prefix} --root=%{buildroot} %files %defattr(-,root,root,-) -%doc README +%doc README.md %{python_sitelib}/* %changelog