From 67f43b2aad761e7d04908742c14441282f20d0db Mon Sep 17 00:00:00 2001
From: Ross Lawley <ross.lawley@gmail.com>
Date: Mon, 29 Jul 2013 15:29:48 +0000
Subject: [PATCH] Allow args and kwargs to be passed through to_json (#420)

---
 docs/changelog.rst           | 4 ++++
 mongoengine/base/document.py | 4 ++--
 mongoengine/queryset/base.py | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index ee92d477..a53d6df4 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -2,6 +2,10 @@
 Changelog
 =========
 
+Changes in 0.8.4
+================
+- Allow args and kwargs to be passed through to_json (#420)
+
 Changes in 0.8.3
 ================
 - Fixed EmbeddedDocuments with `id` also storing `_id` (#402)
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 536fc2f4..e8232a0e 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -321,9 +321,9 @@ class BaseDocument(object):
             message = "ValidationError (%s:%s) " % (self._class_name, pk)
             raise ValidationError(message, errors=errors)
 
-    def to_json(self):
+    def to_json(self, *args, **kwargs):
         """Converts a document to JSON"""
-        return json_util.dumps(self.to_mongo())
+        return json_util.dumps(self.to_mongo(),  *args, **kwargs)
 
     @classmethod
     def from_json(cls, json_data):
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index d3bb4c4b..e88feb30 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -827,9 +827,9 @@ class BaseQuerySet(object):
 
     # JSON Helpers
 
-    def to_json(self):
+    def to_json(self, *args, **kwargs):
         """Converts a queryset to JSON"""
-        return json_util.dumps(self.as_pymongo())
+        return json_util.dumps(self.as_pymongo(), *args, **kwargs)
 
     def from_json(self, json_data):
         """Converts json data to unsaved objects"""