[Python-modules-commits] [ujson] 05/11: merge patched into master

[Sandro Tosi]

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

morph pushed a commit to branch master
in repository ujson.

commit f11d871a1c32f7eacda8fb8c06f1ad0c0b167939
Merge: 4c7e511 b0935cc
Author: Sandro Tosi <morph at debian.org>
Date:   Thu Jan 28 23:02:01 2016 +0000

    merge patched into master

 MANIFEST.in                                       |   0
 PKG-INFO                                          | 228 ++++----
 README.rst                                        | 226 ++++----
 debian/.git-dpm                                   |   6 +-
 debian/patches/0001-dont-remove-build-dir.patch   |   4 +-
 debian/patches/0002-run-test-more-verbosely.patch |   8 +-
 lib/ultrajson.h                                   |   1 +
 lib/ultrajsondec.c                                |   0
 lib/ultrajsonenc.c                                |  49 +-
 python/JSONtoObj.c                                |   0
 python/objToJSON.c                                |  71 ++-
 python/py_defines.h                               |   0
 python/ujson.c                                    |   4 +-
 python/version.h                                  |   2 +-
 setup.py                                          |   7 -
 tests/sample.json                                 |   0
 tests/tests.py                                    | 602 +++++++++-------------
 ujson.egg-info/PKG-INFO                           | 228 ++++----
 ujson.egg-info/SOURCES.txt                        |   0
 ujson.egg-info/dependency_links.txt               |   0
 ujson.egg-info/top_level.txt                      |   0
 21 files changed, 747 insertions(+), 689 deletions(-)

diff --cc debian/.git-dpm
index f89ff58,0000000..8b76724
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
- ec639c9b29db70c1058f83275383cdac5f81adf0
- ec639c9b29db70c1058f83275383cdac5f81adf0
- 052e70ebfb6cb71249602030bfd4cf5b75d52439
++b0935cc7181b96ab050ba2c6f6a3f355bf6086e0
++b0935cc7181b96ab050ba2c6f6a3f355bf6086e0
++6e7a44b3e3a6d732f121c03789cb368ded06d6cd
 +6e7a44b3e3a6d732f121c03789cb368ded06d6cd
 +ujson_1.35.orig.tar.gz
 +566e2936c0fbd0132667fea735ee7096019a63e4
 +192027
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-dont-remove-build-dir.patch
index 40216ef,0000000..5ca3245
mode 100644,000000..100644
--- a/debian/patches/0001-dont-remove-build-dir.patch
+++ b/debian/patches/0001-dont-remove-build-dir.patch
@@@ -1,25 -1,0 +1,25 @@@
- From 24f6d7a10b21ab89a5ed90888c8d5b1c0f742408 Mon Sep 17 00:00:00 2001
++From e9d7894ba677903f0a2973919dc87aece206f000 Mon Sep 17 00:00:00 2001
 +From: Sandro Tosi <morph at debian.org>
 +Date: Wed, 4 Nov 2015 03:21:15 +0000
 +Subject: dont-remove-build-dir
 +
 +---
 + setup.py | 5 -----
 + 1 file changed, 5 deletions(-)
 +
 +diff --git a/setup.py b/setup.py
- index 0bc6985..edd934a 100755
++index 1e1e220..cb3274c 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -22,11 +22,6 @@ Programming Language :: Python :: 3
 + Programming Language :: Python :: 3.2
 + """.splitlines()))
 + 
 +-try:
 +-    shutil.rmtree("./build")
 +-except(OSError):
 +-    pass
 +-
 + module1 = Extension('ujson',
 +                     sources = ['./python/ujson.c', 
 +                                './python/objToJSON.c', 
diff --cc debian/patches/0002-run-test-more-verbosely.patch
index 4372997,0000000..1c91e95
mode 100644,000000..100644
--- a/debian/patches/0002-run-test-more-verbosely.patch
+++ b/debian/patches/0002-run-test-more-verbosely.patch
@@@ -1,22 -1,0 +1,22 @@@
- From ec639c9b29db70c1058f83275383cdac5f81adf0 Mon Sep 17 00:00:00 2001
++From b0935cc7181b96ab050ba2c6f6a3f355bf6086e0 Mon Sep 17 00:00:00 2001
 +From: Sandro Tosi <morph at debian.org>
 +Date: Sun, 17 Jan 2016 23:02:39 +0000
 +Subject: run test more verbosely
 +
 +---
 + tests/tests.py | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/tests/tests.py b/tests/tests.py
- index 44f813c..1001886 100755
++index 23db199..3ed6ee5 100644
 +--- a/tests/tests.py
 ++++ b/tests/tests.py
- @@ -1090,7 +1090,7 @@ raise NotImplementedError("Implement this test!")
++@@ -956,7 +956,7 @@ raise NotImplementedError("Implement this test!")
 + """
 + 
 + if __name__ == "__main__":
 +-    unittest.main()
 ++    unittest.main(verbosity=2)
 + 
-  
 + """
++ # Use this to look for memory leaks

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