14
0

Accepting request 178850 from devel:languages:python

- 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 (forwarded request 178495 from dirkmueller)

OBS-URL: https://build.opensuse.org/request/show/178850
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-python-memcached?expand=0&rev=6
This commit is contained in:
Stephan Kulow
2013-06-14 13:47:20 +00:00
committed by Git OBS Bridge
5 changed files with 28 additions and 48 deletions

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b0bd09a717dd6d9ececb86cd28b041954f33d2022b388ddd113441feea3c19a6
size 13025

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:20bc7e07b0aedbb97447940702f1900ed222a7f9bd6b2784a9d5b314252cd539
size 20176

View File

@@ -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'^(?P<proto>unix):(?P<path>.*)$', host)
if not m:
+ m = re.match(r'^(?P<proto>inet6):'
+ r'\[(?P<host>[^\[\]]+)\](:(?P<port>[0-9]+))?$', host)
+ if not m:
m = re.match(r'^(?P<proto>inet):'
r'(?P<host>[^:]+)(:(?P<port>[0-9]+))?$', host)
if not m: m = re.match(r'^(?P<host>[^:]+)(:(?P<port>[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)

View File

@@ -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

View File

@@ -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