Merge branch 'master' into develop

This commit is contained in:
Nabin Hait 2017-05-23 11:36:55 +05:30
commit 29593d3934
3 changed files with 2 additions and 4 deletions

View file

@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json
from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template
__version__ = '8.0.55'
__version__ = '8.0.56'
__title__ = "Frappe Framework"
local = Local()

View file

@ -122,6 +122,7 @@ def make_form_dict(request):
frappe.local.form_dict.pop("_")
def handle_exception(e):
response = None
http_status_code = getattr(e, "http_status_code", 500)
return_as_message = False

View file

@ -5,9 +5,6 @@ import frappe
'''
FrappeClient is a library that helps you connect with other frappe systems
'''
class AuthError(Exception):