[Python-modules-commits] [simplejson] 02/06: record new upstream branch created by importing simplejson_3.10.0.orig.tar.gz and merge it

[Piotr Ożarowski]

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

piotr pushed a commit to branch master
in repository simplejson.

commit ee61a270a26aa315cafbfd245f1b0931eb34d0b7
Merge: b10f963 bde323c
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Sat Nov 5 21:50:26 2016 +0100

    record new upstream branch created by importing simplejson_3.10.0.orig.tar.gz and merge it

 CHANGES.txt                           | 18 +++++++++++++-
 PKG-INFO                              | 12 ++++++---
 README.rst                            |  8 +++++-
 conf.py                               |  6 ++---
 debian/.git-dpm                       | 14 +++++------
 scripts/artifacts.py                  | 35 +++++++++++++++++++++++++-
 setup.py                              |  2 +-
 simplejson.egg-info/PKG-INFO          | 12 ++++++---
 simplejson.egg-info/SOURCES.txt       |  2 ++
 simplejson/__init__.py                |  4 +--
 simplejson/_speedups.c                | 22 ++++++++++++++++
 simplejson/compat.py                  |  6 -----
 simplejson/decoder.py                 | 18 ++++++++------
 simplejson/encoder.py                 | 24 +++++++++++++++++-
 simplejson/tests/__init__.py          |  2 ++
 simplejson/tests/test_raw_json.py     | 47 +++++++++++++++++++++++++++++++++++
 simplejson/tests/test_str_subclass.py | 16 ++++++++++++
 17 files changed, 212 insertions(+), 36 deletions(-)

diff --cc debian/.git-dpm
index 01cc00e,0000000..215b280
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
- a236fe4ff484fbba9c65e84fd555cd46dc7227ed
- a236fe4ff484fbba9c65e84fd555cd46dc7227ed
- a236fe4ff484fbba9c65e84fd555cd46dc7227ed
- a236fe4ff484fbba9c65e84fd555cd46dc7227ed
- simplejson_3.8.2.orig.tar.gz
- bdc7526f83172210a2916ea433ecda782d0715de
- 76578
++bde323c3b6be4d4a636c4050389953ba6d8cd260
++bde323c3b6be4d4a636c4050389953ba6d8cd260
++bde323c3b6be4d4a636c4050389953ba6d8cd260
++bde323c3b6be4d4a636c4050389953ba6d8cd260
++simplejson_3.10.0.orig.tar.gz
++dffc85c6851430578acf138c2a1193bc89a3eb0f
++77953
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

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