[Python-modules-commits] [flask-restless] 02/02: Initialize git-dpm

[Dominik George]

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

natureshadow-guest pushed a commit to branch master
in repository flask-restless.

commit 16328d3438d1919461770fb9c8ed77be5bb5eaa2
Merge: b94f60f c5a40b2
Author: Dominik George <nik at naturalnet.de>
Date:   Thu Sep 29 13:23:32 2016 +0200

    Initialize git-dpm

 debian/.git-dpm                                             |  8 ++++++++
 ...-the-JSONEncoder-derivative-to-use-the-same-JSONE.patch} | 13 +++++++++++--
 debian/patches/series                                       |  2 +-
 tests/helpers.py                                            |  3 +--
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index 0000000,0000000..bbccd6e
new file mode 100644
--- /dev/null
+++ b/debian/.git-dpm
@@@ -1,0 -1,0 +1,8 @@@
++# see git-dpm(1) from git-dpm package
++c5a40b202729044dd56633333fb4e51e67ae185a
++c5a40b202729044dd56633333fb4e51e67ae185a
++0501e584ac8e1e4a9f472e06831da56bbe4475b5
++0501e584ac8e1e4a9f472e06831da56bbe4475b5
++flask-restless_1.0.0b1.orig.tar.gz
++17b0554ed6c3725cf29a538037ed36d21fb00854
++129657
diff --cc debian/patches/0001-Fix-the-JSONEncoder-derivative-to-use-the-same-JSONE.patch
index 6211030,0000000..ccd3b54
mode 100644,000000..100644
--- a/debian/patches/0001-Fix-the-JSONEncoder-derivative-to-use-the-same-JSONE.patch
+++ b/debian/patches/0001-Fix-the-JSONEncoder-derivative-to-use-the-same-JSONE.patch
@@@ -1,22 -1,0 +1,31 @@@
- Description: Fix the JSONEncoder derivative to use the same JSONEncoder as Flask.
++From c5a40b202729044dd56633333fb4e51e67ae185a Mon Sep 17 00:00:00 2001
++From: Dominik George <nik at naturalnet.de>
++Date: Thu, 29 Sep 2016 13:23:32 +0200
++Subject: Fix the JSONEncoder derivative to use the same JSONEncoder as Flask.
++
 +Bug- https://github.com/jfinkels/flask-restless/issues/583
- Author: Dominik George <nik at naturalnet.de>
++---
++ tests/helpers.py | 3 +--
++ 1 file changed, 1 insertion(+), 2 deletions(-)
++
++diff --git a/tests/helpers.py b/tests/helpers.py
++index b445161..0f86271 100644
 +--- a/tests/helpers.py
 ++++ b/tests/helpers.py
 +@@ -15,7 +15,6 @@ from datetime import datetime
 + from datetime import time
 + from datetime import timedelta
 + from functools import wraps
 +-from json import JSONEncoder
 + import sys
 + import types
 + import uuid
 +@@ -256,7 +255,7 @@ class GUID(TypeDecorator):
 + # serializable by default so we need to create a custom JSON encoder class.
 + #
 + # TODO When Flask 1.0 is required, remove this.
 +-class BetterJSONEncoder(JSONEncoder):
 ++class BetterJSONEncoder(json.JSONEncoder):
 +     """Extends the default JSON encoder to serialize objects from the
 +     :mod:`datetime` module.
 + 
diff --cc debian/patches/series
index 605cd42,0000000..3d82a08
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,1 @@@
- fix-tests-json-import.patch
++0001-Fix-the-JSONEncoder-derivative-to-use-the-same-JSONE.patch

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