use both json and forms

theSage21 · Feb 12, 2019 · 80f426b · 80f426b
1 parent e10c65e
commit 80f426b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/bottle_tools/__init__.py b/bottle_tools/__init__.py
@@ -1,9 +1,10 @@
 import bottle
 import inspect
+import logging
 from collections import defaultdict
 from functools import wraps, partial
 
-__version__ = "2019.2.4"
+__version__ = "2019.2.12"
 
 
 def __cors_dict__(allow_credentials, origin, methods):
@@ -137,7 +138,9 @@ def new_fn(*a, **kw):
         elif method == "GET" or method == "HEAD":
             given = bottle.request.query
         else:  # Everyone else uses forms
-            given = bottle.request.forms
+            given = bottle.request.json
+            given = dict() if given is None else dict(given)
+            given = {**given, **dict(bottle.request.forms)}
         if given is None:
             return bottle.abort(
                 400,

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -23,7 +23,7 @@
 project = "bottle-tools"
 copyright = "2019, Arjoonn Sharma"
 author = "Arjoonn Sharma"
-version = "2019.2.4"
+version = "2019.2.12"
 
 # The short X.Y version
 version = version

diff --git a/setup.py b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup
 
-__version__ = "2019.2.4"
+__version__ = "2019.2.12"
 
 with open("README.md", "r") as fl:
     long_desc = fl.read()