Browse Source

Merge branch 'master' into develop

version-14
Nabin Hait 8 years ago
parent
commit
29593d3934
3 changed files with 2 additions and 4 deletions
  1. +1
    -1
      frappe/__init__.py
  2. +1
    -0
      frappe/app.py
  3. +0
    -3
      frappe/frappeclient.py

+ 1
- 1
frappe/__init__.py View File

@@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json
from .exceptions import * from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template from .utils.jinja import get_jenv, get_template, render_template


__version__ = '8.0.55'
__version__ = '8.0.56'
__title__ = "Frappe Framework" __title__ = "Frappe Framework"


local = Local() local = Local()


+ 1
- 0
frappe/app.py View File

@@ -122,6 +122,7 @@ def make_form_dict(request):
frappe.local.form_dict.pop("_") frappe.local.form_dict.pop("_")


def handle_exception(e): def handle_exception(e):
response = None
http_status_code = getattr(e, "http_status_code", 500) http_status_code = getattr(e, "http_status_code", 500)
return_as_message = False return_as_message = False




+ 0
- 3
frappe/frappeclient.py View File

@@ -5,9 +5,6 @@ import frappe


''' '''
FrappeClient is a library that helps you connect with other frappe systems FrappeClient is a library that helps you connect with other frappe systems



''' '''


class AuthError(Exception): class AuthError(Exception):


Loading…
Cancel
Save