[Python-modules-commits] r19139 - in packages/python-django-piston/trunk/debian/patches (1 file)
svedrin-guest at users.alioth.debian.org
svedrin-guest at users.alioth.debian.org
Tue Nov 1 18:58:52 UTC 2011
Date: Tuesday, November 1, 2011 @ 18:58:51
Author: svedrin-guest
Revision: 19139
remove the python pickle fallback as it breaks the fix
Modified:
packages/python-django-piston/trunk/debian/patches/03-fix-pickle-load.diff
Modified: packages/python-django-piston/trunk/debian/patches/03-fix-pickle-load.diff
===================================================================
--- packages/python-django-piston/trunk/debian/patches/03-fix-pickle-load.diff 2011-11-01 18:42:06 UTC (rev 19138)
+++ packages/python-django-piston/trunk/debian/patches/03-fix-pickle-load.diff 2011-11-01 18:58:51 UTC (rev 19139)
@@ -5,9 +5,22 @@
Index: python-django-piston-0.2.2/piston/emitters.py
===================================================================
---- python-django-piston-0.2.2.orig/piston/emitters.py 2011-11-01 19:34:51.029580091 +0100
-+++ python-django-piston-0.2.2/piston/emitters.py 2011-11-01 19:37:42.993577140 +0100
-@@ -395,7 +395,13 @@
+--- python-django-piston-0.2.2.orig/piston/emitters.py 2011-11-01 19:57:06.972557882 +0100
++++ python-django-piston-0.2.2/piston/emitters.py 2011-11-01 19:57:50.561557130 +0100
+@@ -35,10 +35,8 @@
+ except ImportError:
+ import StringIO
+
+-try:
+- import cPickle as pickle
+-except ImportError:
+- import pickle
++# Do not fallback to standard pickle as the fix for #646517 will not work with it.
++import cPickle as pickle
+
+ class Emitter(object):
+ """
+@@ -395,7 +393,13 @@
return pickle.dumps(self.construct())
Emitter.register('pickle', PickleEmitter, 'application/python-pickle')
More information about the Python-modules-commits
mailing list