[Python-modules-commits] [python-phpserialize] 05/07: merge patched into master

[Tristan Seligmann]

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

mithrandi pushed a commit to branch master
in repository python-phpserialize.

commit 85b92febd724e2128138dbf429e0ab94b9a61728
Merge: 261620d e41b544
Author: Tristan Seligmann <mithrandi at mithrandi.net>
Date:   Wed Oct 14 20:04:04 2015 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...redDict-to-make-the-dict-serialization-te.patch | 30 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 tests.py                                           |  3 ++-
 4 files changed, 35 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 89c09ed,0000000..44b69e2
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 501ce4cbd6f5ae34c5c886017b7ca7910f936180
- 501ce4cbd6f5ae34c5c886017b7ca7910f936180
++e41b544fdd95d0ea82bfea0b8d0abdde533909c1
++e41b544fdd95d0ea82bfea0b8d0abdde533909c1
 +501ce4cbd6f5ae34c5c886017b7ca7910f936180
 +501ce4cbd6f5ae34c5c886017b7ca7910f936180
 +python-phpserialize_1.3.orig.tar.gz
 +bfed8e439b6e94d71659b0a7393fa88c29535a10
 +7225
diff --cc debian/patches/0001-Use-an-OrderedDict-to-make-the-dict-serialization-te.patch
index 0000000,0000000..ec5898e
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Use-an-OrderedDict-to-make-the-dict-serialization-te.patch
@@@ -1,0 -1,0 +1,30 @@@
++From e41b544fdd95d0ea82bfea0b8d0abdde533909c1 Mon Sep 17 00:00:00 2001
++From: Tristan Seligmann <mithrandi at mithrandi.net>
++Date: Wed, 14 Oct 2015 20:04:01 +0200
++Subject: Use an OrderedDict to make the dict serialization test reliable.
++
++---
++ tests.py | 3 ++-
++ 1 file changed, 2 insertions(+), 1 deletion(-)
++
++diff --git a/tests.py b/tests.py
++index f6d7066..ca407d4 100644
++--- a/tests.py
+++++ b/tests.py
++@@ -1,6 +1,7 @@
++ # -*- coding: utf-8 -*-
++ import unittest
++ import phpserialize
+++from collections import OrderedDict
++ 
++ 
++ class PhpSerializeTestCase(unittest.TestCase):
++@@ -32,7 +33,7 @@ class PhpSerializeTestCase(unittest.TestCase):
++                          b'a:3:{i:0;i:7;i:1;i:8;i:2;i:9;}')
++ 
++     def test_dumps_dict(self):
++-        self.assertEqual(phpserialize.dumps({'a': 1, 'b': 2, 'c': 3}),
+++        self.assertEqual(phpserialize.dumps(OrderedDict([('a', 1), ('c', 3), ('b': 2)])),
++                          b'a:3:{s:1:"a";i:1;s:1:"c";i:3;s:1:"b";i:2;}')
++ 
++     def test_loads_dict(self):
diff --cc debian/patches/series
index 0000000,0000000..d27fb70
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Use-an-OrderedDict-to-make-the-dict-serialization-te.patch

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