summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <patrick.mclean@sony.com>2019-12-09 14:46:17 -0800
committerPatrick McLean <chutzpah@gentoo.org>2019-12-09 17:13:35 -0800
commit525ee6507f05e96ec5e7db8ef6c547eae7c8d639 (patch)
tree67f43e258206764dbd0c011a62d88259c0b618be /dev-python/pylibmc/files
parentmozconfig-v6.60.eclass: Last rite (diff)
downloadgentoo-525ee6507f05e96ec5e7db8ef6c547eae7c8d639.tar.gz
gentoo-525ee6507f05e96ec5e7db8ef6c547eae7c8d639.tar.bz2
gentoo-525ee6507f05e96ec5e7db8ef6c547eae7c8d639.zip
dev-python/pylibmc-1.6.1-r1: Revbump, update patch to fix tests
Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
Diffstat (limited to 'dev-python/pylibmc/files')
-rw-r--r--dev-python/pylibmc/files/pylibmc-1.6.1-fix-test-failures-r1.patch (renamed from dev-python/pylibmc/files/pylibmc-1.6.1-fix-test-failures.patch)6
1 files changed, 2 insertions, 4 deletions
diff --git a/dev-python/pylibmc/files/pylibmc-1.6.1-fix-test-failures.patch b/dev-python/pylibmc/files/pylibmc-1.6.1-fix-test-failures-r1.patch
index c19ab468ce8a..0a91fd39266e 100644
--- a/dev-python/pylibmc/files/pylibmc-1.6.1-fix-test-failures.patch
+++ b/dev-python/pylibmc/files/pylibmc-1.6.1-fix-test-failures-r1.patch
@@ -2,16 +2,14 @@ diff --git a/src/_pylibmcmodule.c b/src/_pylibmcmodule.c
index 5324d1d..70c18cb 100644
--- a/src/_pylibmcmodule.c
+++ b/src/_pylibmcmodule.c
-@@ -600,6 +600,13 @@ static PyObject *_PylibMC_parse_memcached_value(PylibMC_Client *self,
+@@ -600,6 +600,11 @@ static PyObject *_PylibMC_parse_memcached_value(PylibMC_Client *self,
}
#endif
-
-+#if PY_MAJOR_VERSION >= 3
+
+ /* make sure we don't pass a null pointer to _PylibMC_deserialize_native */
+ if (value == NULL) {
+ value = "";
+ }
-+#endif
+
if (self->native_deserialization) {
retval = _PylibMC_deserialize_native(self, NULL, value, size, flags);