[Python-modules-commits] [django-picklefield] 06/15: merge patched into master

[Michael Fladischer]

This is an automated email from the git hooks/post-receive script.

fladi pushed a commit to tag debian/0.3.2-1
in repository django-picklefield.

commit 056405475c07db9b941bd5d46439329748c257b6
Merge: c12b9c5 94f24d0
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Thu Mar 31 20:46:47 2016 +0200

    merge patched into master

 PKG-INFO                                     | 78 ++++++++++++++++++----------
 README => README.rst                         | 72 ++++++++++++++++---------
 debian/.git-dpm                              |  6 +--
 debian/patches/fix_tests.patch               | 15 +++---
 setup.cfg                                    | 13 +++++
 setup.py                                     | 18 +++----
 src/django_picklefield.egg-info/PKG-INFO     | 78 ++++++++++++++++++----------
 src/django_picklefield.egg-info/SOURCES.txt  |  4 +-
 src/django_picklefield.egg-info/requires.txt |  1 -
 src/picklefield/__init__.py                  |  2 +-
 src/picklefield/compat.py                    | 23 ++++----
 src/picklefield/fields.py                    | 49 +++++++----------
 src/picklefield/tests.py                     | 51 +++++++++---------
 13 files changed, 236 insertions(+), 174 deletions(-)

diff --cc debian/.git-dpm
index d4013a6,0000000..83f826e
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 79736a4dfc017b3a90ef51e44efe1bbbbd23b6e7
- 79736a4dfc017b3a90ef51e44efe1bbbbd23b6e7
- d5dc848c08adc0bfd98f7a3237e4dc064e7513de
++94f24d0f022b4c5835fa35a3d7cafaceebe47f99
++94f24d0f022b4c5835fa35a3d7cafaceebe47f99
++46c6809aea1dfa066aeea21190adb26876b77ee2
 +46c6809aea1dfa066aeea21190adb26876b77ee2
 +django-picklefield_0.3.2.orig.tar.gz
 +6f19f9e20838b94efb98c81ac645a079d40f04f7
 +9715
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/fix_tests.patch
index cb437de,0000000..eed11ce
mode 100644,000000..100644
--- a/debian/patches/fix_tests.patch
+++ b/debian/patches/fix_tests.patch
@@@ -1,31 -1,0 +1,30 @@@
- From 79736a4dfc017b3a90ef51e44efe1bbbbd23b6e7 Mon Sep 17 00:00:00 2001
++From 94f24d0f022b4c5835fa35a3d7cafaceebe47f99 Mon Sep 17 00:00:00 2001
 +From: Michael Fladischer <FladischerMichael at fladi.at>
 +Date: Thu, 8 Oct 2015 08:55:32 -0700
 +Subject: compare objects by fields not by instance
 +
 + Upstream tests are comparing the original object directly with the deserialized
 + one. This fails because the default python comparison for objects uses their
 + identity which fails for two different object instances.
 + This patch does the comparison by field for both objects.
 +Last-Update: 2014-08-29
 +Forwarded: https://github.com/shrubberysoft/django-picklefield/pull/16
 +
 +Patch-Name: fix_tests.patch
 +---
-  src/picklefield/tests.py | 6 ++++--
-  1 file changed, 4 insertions(+), 2 deletions(-)
++ src/picklefield/tests.py | 5 ++++-
++ 1 file changed, 4 insertions(+), 1 deletion(-)
 +
 +diff --git a/src/picklefield/tests.py b/src/picklefield/tests.py
- index ea766f4..ac8ce2a 100644
++index 2430b21..4e88ee2 100644
 +--- a/src/picklefield/tests.py
 ++++ b/src/picklefield/tests.py
- @@ -167,5 +167,7 @@ class PickledObjectFieldTests(TestCase):
-                'fields': {"pickle_field": p}}])
++@@ -166,4 +166,7 @@ class PickledObjectFieldTests(TestCase):
++         ])
 + 
 +         for deserialized_test in serializers.deserialize('json', serialized):
- -            self.assertEquals(deserialized_test.object,
- -                              model)
++-            self.assertEqual(deserialized_test.object, model)
 ++            self.assertEquals(deserialized_test.object.pk,
 ++                              model.pk)
 ++            self.assertEquals(deserialized_test.object.pickle_field,
 ++                              model.pickle_field)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-picklefield.git