From 7a12d3399f40f7e7ab0a1c64c4e414a33da4cf21 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Tue, 22 Jan 2019 23:01:14 +0530 Subject: [PATCH 01/35] fix(email): Pass args as unicode in Py2 & bytes in Py3 to SMTP.login --- frappe/email/smtp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/email/smtp.py b/frappe/email/smtp.py index fa6b92fc33..1794c8215d 100644 --- a/frappe/email/smtp.py +++ b/frappe/email/smtp.py @@ -210,7 +210,7 @@ class SMTPServer: self._sess.ehlo() if self.login and self.password: - ret = self._sess.login((self.login or ""), (self.password or "")) + ret = self._sess.login(str(self.login or ""), str(self.password or "")) # check if logged correctly if ret[0]!=235: From 6b72faf44fa7f9ea350dad89d309bcf1729fbc25 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 23 Jan 2019 16:39:55 +0530 Subject: [PATCH 02/35] style: Linting fixes (#6809) * style: Remove unused imports * style: Remove unused local variables --- frappe/commands/scheduler.py | 2 +- frappe/commands/translate.py | 1 - frappe/core/utils.py | 2 +- frappe/desk/query_builder.py | 16 +++++----------- frappe/desk/reportview.py | 1 - frappe/email/email_body.py | 2 +- frappe/email/test_email_body.py | 2 +- frappe/model/__init__.py | 1 - frappe/model/base_document.py | 2 +- frappe/modules/export_file.py | 2 +- frappe/tests/__init__.py | 8 ++++---- frappe/tests/test_fmt_money.py | 3 +-- frappe/tests/test_form_load.py | 2 +- frappe/tests/test_geo_ip.py | 1 - frappe/tests/test_permissions.py | 4 +--- frappe/tests/test_twofactor.py | 2 +- frappe/utils/backups.py | 2 -- frappe/utils/boilerplate.py | 2 +- frappe/utils/change_log.py | 7 +++---- frappe/utils/data.py | 2 +- frappe/utils/dateutils.py | 4 ++-- frappe/utils/error.py | 1 - frappe/utils/file_manager.py | 1 - frappe/utils/goal.py | 2 +- frappe/utils/password_strength.py | 2 +- frappe/utils/pdf.py | 2 +- frappe/utils/print_format.py | 7 ++----- frappe/utils/reset_doc.py | 5 ++--- frappe/utils/xlsxutils.py | 5 ++--- frappe/website/render.py | 4 ++-- frappe/www/profile.py | 5 +---- frappe/www/rss.py | 1 - frappe/www/sitemap.py | 2 -- frappe/www/website_theme.py | 1 - 34 files changed, 38 insertions(+), 68 deletions(-) diff --git a/frappe/commands/scheduler.py b/frappe/commands/scheduler.py index caa0d7ed62..8d1cca286d 100755 --- a/frappe/commands/scheduler.py +++ b/frappe/commands/scheduler.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals, absolute_import, print_function import click -import json, sys +import sys import frappe from frappe.utils import cint from frappe.commands import pass_context, get_site diff --git a/frappe/commands/translate.py b/frappe/commands/translate.py index 1a94210566..5a48e2b409 100644 --- a/frappe/commands/translate.py +++ b/frappe/commands/translate.py @@ -1,6 +1,5 @@ from __future__ import unicode_literals, absolute_import, print_function import click -import frappe from frappe.commands import pass_context, get_site # translation diff --git a/frappe/core/utils.py b/frappe/core/utils.py index 89aba20cd8..42193d0cb9 100644 --- a/frappe/core/utils.py +++ b/frappe/core/utils.py @@ -2,7 +2,7 @@ # MIT License. See license.txt import frappe -from frappe import _ + def get_parent_doc(doc): """Returns document of `reference_doctype`, `reference_doctype`""" diff --git a/frappe/desk/query_builder.py b/frappe/desk/query_builder.py index 2acf0c4526..a952e86cdb 100644 --- a/frappe/desk/query_builder.py +++ b/frappe/desk/query_builder.py @@ -1,5 +1,5 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# MIT License. See license.txt +# MIT License. See license.txt from __future__ import unicode_literals import frappe @@ -78,7 +78,7 @@ def add_match_conditions(q, tl): q = q[0] + condition_st + '(' + ' OR '.join(sl) + ') ' + condition_end + q[1] else: q = q + condition_st + '(' + ' OR '.join(sl) + ')' - + return q def guess_type(m): @@ -178,7 +178,7 @@ def runquery(q='', ret=0, from_export=0): meta = get_sql_meta(tl) q = add_match_conditions(q, tl) - + # replace special variables q = q.replace('__user', frappe.session.user) q = q.replace('__today', frappe.utils.nowdate()) @@ -223,9 +223,6 @@ def runquery(q='', ret=0, from_export=0): def runquery_csv(): global out - # run query - res = runquery(from_export = 1) - q = frappe.form_dict.get('query') rep_name = frappe.form_dict.get('report_name') @@ -237,9 +234,6 @@ def runquery_csv(): if not rep_name: rep_name = 'DataExport' - # Headings - heads = [] - rows = [[rep_name], out['colnames']] + out['values'] from six import StringIO @@ -264,9 +258,9 @@ def add_limit_to_query(query, args): if args.get('limit_page_length'): query += """ limit %(limit_start)s, %(limit_page_length)s""" - + import frappe.utils args['limit_start'] = frappe.utils.cint(args.get('limit_start')) args['limit_page_length'] = frappe.utils.cint(args.get('limit_page_length')) - + return query, args diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py index 76dbf38d11..7c6e7a4b75 100644 --- a/frappe/desk/reportview.py +++ b/frappe/desk/reportview.py @@ -45,7 +45,6 @@ def get_form_params(): else: data["save_user_settings"] = True - doctype = data["doctype"] fields = data["fields"] for field in fields: diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py index f41e6d76c9..0cdaa66a58 100755 --- a/frappe/email/email_body.py +++ b/frappe/email/email_body.py @@ -6,7 +6,7 @@ import frappe, re, os from frappe.utils.pdf import get_pdf from frappe.email.smtp import get_outgoing_email_account from frappe.utils import (get_url, scrub_urls, strip, expand_relative_urls, cint, - split_emails, to_markdown, markdown, encode, random_string, parse_addr) + split_emails, to_markdown, markdown, random_string, parse_addr) import email.utils from six import iteritems, text_type, string_types from email.mime.multipart import MIMEMultipart diff --git a/frappe/email/test_email_body.py b/frappe/email/test_email_body.py index 3f6502cdd4..b0bfddd4f0 100644 --- a/frappe/email/test_email_body.py +++ b/frappe/email/test_email_body.py @@ -2,7 +2,7 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import frappe, unittest, os, base64 +import unittest, os, base64 from frappe.email.email_body import (replace_filename_with_cid, get_email, inline_style_in_html, get_header) diff --git a/frappe/model/__init__.py b/frappe/model/__init__.py index f4f8207ba0..8c8a4bea32 100644 --- a/frappe/model/__init__.py +++ b/frappe/model/__init__.py @@ -4,7 +4,6 @@ # model __init__.py from __future__ import unicode_literals import frappe -import json no_value_fields = ('Section Break', 'Column Break', 'HTML', 'Table', 'Button', 'Image', diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index d97c580f3d..3ce9e7f854 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -6,7 +6,7 @@ from six import iteritems, string_types import datetime import frappe, sys from frappe import _ -from frappe.utils import (cint, flt, now, cstr, strip_html, getdate, get_datetime, to_timedelta, +from frappe.utils import (cint, flt, now, cstr, strip_html, sanitize_html, sanitize_email, cast_fieldtype) from frappe.model import default_fields from frappe.model.naming import set_new_name diff --git a/frappe/modules/export_file.py b/frappe/modules/export_file.py index 275db10b13..66a6a9f6b7 100644 --- a/frappe/modules/export_file.py +++ b/frappe/modules/export_file.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals -import frappe, os, json +import frappe, os import frappe.model from frappe.modules import scrub, get_module_path, scrub_dt_dn diff --git a/frappe/tests/__init__.py b/frappe/tests/__init__.py index b00c7368cc..d8426429bb 100644 --- a/frappe/tests/__init__.py +++ b/frappe/tests/__init__.py @@ -14,7 +14,7 @@ def insert_test_data(doctype, sort_fn=None): def get_test_doclist(doctype, name=None): """get test doclist, collection of doclists""" - import os, frappe + import os from frappe import conf from frappe.modules.utils import peval_doclist from frappe.modules import scrub @@ -22,17 +22,17 @@ def get_test_doclist(doctype, name=None): doctype = scrub(doctype) doctype_path = os.path.join(os.path.dirname(os.path.abspath(conf.__file__)), conf.test_data_path, doctype) - + if name: with open(os.path.join(doctype_path, scrub(name) + ".json"), 'r') as txtfile: doclist = peval_doclist(txtfile.read()) return doclist - + else: all_doclists = [] for fname in filter(lambda n: n.endswith(".json"), os.listdir(doctype_path)): with open(os.path.join(doctype_path, scrub(fname)), 'r') as txtfile: all_doclists.append(peval_doclist(txtfile.read())) - + return all_doclists diff --git a/frappe/tests/test_fmt_money.py b/frappe/tests/test_fmt_money.py index 888360d097..a1321658b7 100644 --- a/frappe/tests/test_fmt_money.py +++ b/frappe/tests/test_fmt_money.py @@ -3,8 +3,7 @@ from __future__ import unicode_literals import frappe -from frappe import _ -from frappe.utils import flt, cstr, fmt_money +from frappe.utils import fmt_money import unittest class TestFmtMoney(unittest.TestCase): diff --git a/frappe/tests/test_form_load.py b/frappe/tests/test_form_load.py index d07e61c600..11dada17d0 100644 --- a/frappe/tests/test_form_load.py +++ b/frappe/tests/test_form_load.py @@ -5,7 +5,7 @@ from __future__ import unicode_literals import frappe, unittest from frappe.desk.form.load import getdoctype, getdoc from frappe.core.page.permission_manager.permission_manager import update, reset -from frappe.permissions import get_valid_perms + class TestFormLoad(unittest.TestCase): def test_load(self): diff --git a/frappe/tests/test_geo_ip.py b/frappe/tests/test_geo_ip.py index 23a2881ec5..b292e43ba5 100644 --- a/frappe/tests/test_geo_ip.py +++ b/frappe/tests/test_geo_ip.py @@ -2,7 +2,6 @@ # MIT License. See license.txt from __future__ import unicode_literals -import frappe import unittest class TestGeoIP(unittest.TestCase): diff --git a/frappe/tests/test_permissions.py b/frappe/tests/test_permissions.py index 13106697c5..465034d7a2 100644 --- a/frappe/tests/test_permissions.py +++ b/frappe/tests/test_permissions.py @@ -7,11 +7,9 @@ from __future__ import unicode_literals import frappe import frappe.defaults import unittest -import json import frappe.model.meta from frappe.permissions import (add_user_permission, remove_user_permission, - clear_user_permissions_for_doctype, get_doc_permissions, add_permission, - get_valid_perms) + clear_user_permissions_for_doctype, get_doc_permissions, add_permission) from frappe.core.page.permission_manager.permission_manager import update, reset from frappe.test_runner import make_test_records_for_doctype from frappe.core.doctype.user_permission.user_permission import clear_user_permissions diff --git a/frappe/tests/test_twofactor.py b/frappe/tests/test_twofactor.py index b5eccec81d..c98cf213b2 100644 --- a/frappe/tests/test_twofactor.py +++ b/frappe/tests/test_twofactor.py @@ -9,7 +9,7 @@ from frappe.auth import HTTPRequest from frappe.utils import cint from frappe.twofactor import (should_run_2fa, authenticate_for_2factor, get_cached_user_pass, two_factor_is_enabled_for_, confirm_otp_token, get_otpsecret_for_, get_verification_obj, - render_string_template, two_factor_is_enabled) + render_string_template) import time diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index 7254ba7fd4..4ec68e536d 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -58,8 +58,6 @@ class BackupGenerator: self.backup_path_private_files = last_private_file def set_backup_file_name(self): - import random - todays_date = now_datetime().strftime('%Y%m%d_%H%M%S') site = frappe.local.site or frappe.generate_hash(length=8) site = site.replace('.', '_') diff --git a/frappe/utils/boilerplate.py b/frappe/utils/boilerplate.py index 6da734916c..abb0a41aa6 100755 --- a/frappe/utils/boilerplate.py +++ b/frappe/utils/boilerplate.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals, print_function from six.moves import input import frappe, os, re -from frappe.utils import touch_file, encode, cstr +from frappe.utils import touch_file, cstr def make_boilerplate(dest, app_name): if not os.path.exists(dest): diff --git a/frappe/utils/change_log.py b/frappe/utils/change_log.py index 22de21ea93..c63cd4c34d 100644 --- a/frappe/utils/change_log.py +++ b/frappe/utils/change_log.py @@ -11,7 +11,7 @@ import subprocess # nosec from frappe.utils import cstr from frappe.utils.gitutils import get_app_branch from frappe import _, safe_decode -import git + def get_change_log(user=None): if not user: user = frappe.session.user @@ -123,7 +123,7 @@ def get_app_branch(app): result = safe_decode(result) result = result.strip() return result - except Exception as e: + except Exception: return '' def get_app_last_commit_ref(app): @@ -133,7 +133,7 @@ def get_app_last_commit_ref(app): result = safe_decode(result) result = result.strip() return result - except Exception as e: + except Exception: return '' def check_for_update(): @@ -222,7 +222,6 @@ def show_update_popup(): return updates = json.loads(update_info) - current_versions = get_versions() # Check if user is int the set of users to send update message to update_message = "" diff --git a/frappe/utils/data.py b/frappe/utils/data.py index 73458b5952..dd3d9e3c94 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals # IMPORTANT: only import safe functions as this module will be included in jinja environment import frappe import operator -import re, urllib, datetime, math, time +import re, datetime, math, time import babel.dates from babel.core import UnknownLocaleError from dateutil import parser diff --git a/frappe/utils/dateutils.py b/frappe/utils/dateutils.py index ec9d6edc86..d5b7a3136b 100644 --- a/frappe/utils/dateutils.py +++ b/frappe/utils/dateutils.py @@ -30,7 +30,7 @@ def user_to_str(date, date_format=None): try: return datetime.datetime.strptime(date, dateformats[date_format]).strftime('%Y-%m-%d') - except ValueError as e: + except ValueError: raise ValueError("Date %s must be in format %s" % (date, date_format)) def parse_date(date): @@ -50,7 +50,7 @@ def parse_date(date): parsed_date = user_to_str(date, f) if parsed_date: break - except ValueError as e: + except ValueError: pass if not parsed_date: diff --git a/frappe/utils/error.py b/frappe/utils/error.py index 9269d6b3cb..f249355ee5 100644 --- a/frappe/utils/error.py +++ b/frappe/utils/error.py @@ -13,7 +13,6 @@ import traceback import linecache import pydoc import cgitb -import types import datetime import json import six diff --git a/frappe/utils/file_manager.py b/frappe/utils/file_manager.py index 2d638b733a..ffe337df0b 100644 --- a/frappe/utils/file_manager.py +++ b/frappe/utils/file_manager.py @@ -28,7 +28,6 @@ def upload(): # get record details dt = frappe.form_dict.doctype dn = frappe.form_dict.docname - df = frappe.form_dict.docfield file_url = frappe.form_dict.file_url filename = frappe.form_dict.filename frappe.form_dict.is_private = cint(frappe.form_dict.is_private) diff --git a/frappe/utils/goal.py b/frappe/utils/goal.py index b699555fca..44415f43db 100644 --- a/frappe/utils/goal.py +++ b/frappe/utils/goal.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals import frappe from frappe import _ -from six.moves import xrange + def get_monthly_results(goal_doctype, goal_field, date_col, filter_str, aggregation = 'sum'): '''Get monthly aggregation values for given field of doctype''' diff --git a/frappe/utils/password_strength.py b/frappe/utils/password_strength.py index 203a24cae1..a4182d1cab 100644 --- a/frappe/utils/password_strength.py +++ b/frappe/utils/password_strength.py @@ -5,7 +5,7 @@ from __future__ import unicode_literals try: from zxcvbn import zxcvbn -except Exception as e: +except Exception: import zxcvbn import frappe diff --git a/frappe/utils/pdf.py b/frappe/utils/pdf.py index 4d6bcde17e..45d14c0595 100644 --- a/frappe/utils/pdf.py +++ b/frappe/utils/pdf.py @@ -6,7 +6,7 @@ import pdfkit, os, frappe from frappe.utils import scrub_urls from frappe import _ from bs4 import BeautifulSoup -from PyPDF2 import PdfFileWriter, PdfFileReader +from PyPDF2 import PdfFileReader import re def get_pdf(html, options=None, output = None): diff --git a/frappe/utils/print_format.py b/frappe/utils/print_format.py index 26f90e16f2..a254f0b8d1 100644 --- a/frappe/utils/print_format.py +++ b/frappe/utils/print_format.py @@ -1,13 +1,10 @@ from __future__ import unicode_literals -import frappe, os, copy, json, re +import frappe, os from frappe import _ -from frappe.modules import get_doc_path -from jinja2 import TemplateNotFound -from frappe.utils import cint, strip_html from frappe.utils.pdf import get_pdf,cleanup -from PyPDF2 import PdfFileWriter, PdfFileReader +from PyPDF2 import PdfFileWriter no_cache = 1 no_sitemap = 1 diff --git a/frappe/utils/reset_doc.py b/frappe/utils/reset_doc.py index ef20b0157b..3dc91408dd 100755 --- a/frappe/utils/reset_doc.py +++ b/frappe/utils/reset_doc.py @@ -1,10 +1,9 @@ import frappe import json, os -from frappe.modules import scrub, get_module_path, load_doctype_module, utils +from frappe.modules import scrub, get_module_path, utils from frappe.custom.doctype.customize_form.customize_form import doctype_properties, docfield_properties from frappe.custom.doctype.property_setter.property_setter import make_property_setter from frappe.custom.doctype.custom_field.custom_field import create_custom_field -from frappe.modules.import_file import get_file_path, read_doc_from_file from frappe.core.page.permission_manager.permission_manager import get_standard_permissions from frappe.permissions import setup_custom_perms from six.moves.urllib.request import urlopen @@ -89,7 +88,7 @@ def make_custom_fields(doctype, local_doc, original_doc): custom_docfield_properties, prev = get_custom_docfield_properties(), "" for field, field_dict in local_fields: - df, doc = {}, {} + df = {} if field not in original_fields: for prop in field_dict: if prop in custom_docfield_properties: diff --git a/frappe/utils/xlsxutils.py b/frappe/utils/xlsxutils.py index 1a4331328d..17e5e7683a 100644 --- a/frappe/utils/xlsxutils.py +++ b/frappe/utils/xlsxutils.py @@ -3,13 +3,12 @@ from __future__ import unicode_literals import frappe -from frappe.utils import encode, cstr, cint, flt, comma_or import openpyxl import re from openpyxl.styles import Font from openpyxl import load_workbook -from six import StringIO, BytesIO, string_types +from six import BytesIO, string_types ILLEGAL_CHARACTERS_RE = re.compile(r'[\000-\010]|[\013-\014]|[\016-\037]') # return xlsx file object @@ -53,7 +52,7 @@ def handle_html(data): if '>' not in data: return data - from html2text import unescape, HTML2Text + from html2text import HTML2Text h = HTML2Text() h.unicode_snob = True diff --git a/frappe/website/render.py b/frappe/website/render.py index 88e0eb235d..b0f0641ac5 100644 --- a/frappe/website/render.py +++ b/frappe/website/render.py @@ -43,7 +43,7 @@ def render(path=None, http_status_code=None): else: try: data = render_page_by_language(path) - except frappe.DoesNotExistError as e: + except frappe.DoesNotExistError: doctype, name = get_doctype_from_path(path) if doctype and name: path = "printview" @@ -77,7 +77,7 @@ def render(path=None, http_status_code=None): data = add_csrf_token(data) - except frappe.Redirect as e: + except frappe.Redirect: return build_response(path, "", 301, { "Location": frappe.flags.redirect_location or (frappe.local.response or {}).get('location'), "Cache-Control": "no-store, no-cache, must-revalidate" diff --git a/frappe/www/profile.py b/frappe/www/profile.py index 3d56f672f2..f066a13ed7 100644 --- a/frappe/www/profile.py +++ b/frappe/www/profile.py @@ -2,10 +2,7 @@ # MIT License. See license.txt from __future__ import unicode_literals -import frappe -from frappe import _ -from frappe.utils.user import get_fullname_and_avatar -import frappe.www.list + no_cache = 1 no_sitemap = 1 diff --git a/frappe/www/rss.py b/frappe/www/rss.py index 4edeaef83b..a389304e5e 100644 --- a/frappe/www/rss.py +++ b/frappe/www/rss.py @@ -3,7 +3,6 @@ from __future__ import unicode_literals import frappe -import urllib from frappe.utils import escape_html, get_request_site_address, now, cstr from six.moves.urllib.parse import quote, urljoin diff --git a/frappe/www/sitemap.py b/frappe/www/sitemap.py index b465492058..bd1d02e26d 100644 --- a/frappe/www/sitemap.py +++ b/frappe/www/sitemap.py @@ -3,8 +3,6 @@ from __future__ import unicode_literals -import urllib -import frappe from frappe.utils import get_request_site_address, get_datetime, nowdate from frappe.website.router import get_pages, get_all_page_context_from_doctypes from six import iteritems diff --git a/frappe/www/website_theme.py b/frappe/www/website_theme.py index ca84a303b7..972cbe0acd 100644 --- a/frappe/www/website_theme.py +++ b/frappe/www/website_theme.py @@ -3,7 +3,6 @@ from __future__ import unicode_literals import re -import frappe from frappe.website.utils import get_shade from frappe.website.doctype.website_theme.website_theme import get_active_theme From 7bd056c2d12a63e200d7bf60d2f6118e8e86a9b8 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 23 Jan 2019 16:43:37 +0530 Subject: [PATCH 03/35] fix: Use ImportError instead of ModuleNotFoundError (#6808) ModuleNotFoundError is available in python 3.6 This should have been included in Frappe PR #6797 --- frappe/printing/doctype/print_settings/print_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/printing/doctype/print_settings/print_settings.py b/frappe/printing/doctype/print_settings/print_settings.py index 8043130358..2758f0aa9c 100644 --- a/frappe/printing/doctype/print_settings/print_settings.py +++ b/frappe/printing/doctype/print_settings/print_settings.py @@ -18,7 +18,7 @@ class PrintSettings(Document): printer_list = [] try: import cups - except ModuleNotFoundError: + except ImportError: frappe.throw("You need to install pycups to use this feature!") return try: From 236fa87051a310ceae3020bd734eddd0772cb1a0 Mon Sep 17 00:00:00 2001 From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com> Date: Wed, 23 Jan 2019 16:47:16 +0530 Subject: [PATCH 04/35] fix(comment): Encoding issue in jinja for mention in comment (#6813) --- frappe/core/doctype/communication/comment.py | 6 ++++-- frappe/templates/emails/mentioned_in_comment.html | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/frappe/core/doctype/communication/comment.py b/frappe/core/doctype/communication/comment.py index 0ceb93219c..fa3a7b2dcc 100644 --- a/frappe/core/doctype/communication/comment.py +++ b/frappe/core/doctype/communication/comment.py @@ -96,15 +96,17 @@ def notify_mentions(doc): recipients = [frappe.db.get_value("User", {"enabled": 1, "name": name, "user_type": "System User"}, "email") for name in mentions] + link = get_link_to_form(doc.reference_doctype, doc.reference_name, label=parent_doc_label) + frappe.sendmail( recipients=recipients, sender=frappe.session.user, subject=subject, template="mentioned_in_comment", args={ - "sender_fullname": sender_fullname, + "body_content": _("{0} mentioned you in a comment in {1}").format(sender_fullname, link), "comment": doc, - "link": get_link_to_form(doc.reference_doctype, doc.reference_name, label=parent_doc_label) + "link": link }, header=[_('New Mention'), 'orange'] ) diff --git a/frappe/templates/emails/mentioned_in_comment.html b/frappe/templates/emails/mentioned_in_comment.html index becf1dfd25..92bf15723a 100644 --- a/frappe/templates/emails/mentioned_in_comment.html +++ b/frappe/templates/emails/mentioned_in_comment.html @@ -1,5 +1,5 @@

- {{ _("{0} mentioned you in a comment in {1}").format(sender_fullname, link) }} + {{ body_content }}

From 8bdb0dc5f8445273716c7c907e19e46c3b7a2390 Mon Sep 17 00:00:00 2001 From: Zarrar Date: Wed, 23 Jan 2019 16:51:02 +0530 Subject: [PATCH 05/35] feat: Download json file (#6793) * feat: download file as json type * fix: make raw type files downloadable --- frappe/utils/response.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/utils/response.py b/frappe/utils/response.py index 4809fcb45b..8b19fc4607 100644 --- a/frappe/utils/response.py +++ b/frappe/utils/response.py @@ -68,7 +68,7 @@ def as_txt(): def as_raw(): response = Response() response.mimetype = frappe.response.get("content_type") or mimetypes.guess_type(frappe.response['filename'])[0] or "application/unknown" - response.headers["Content-Disposition"] = ("filename=\"%s\"" % frappe.response['filename'].replace(' ', '_')).encode("utf-8") + response.headers["Content-Disposition"] = ("attachment; filename=\"%s\"" % frappe.response['filename'].replace(' ', '_')).encode("utf-8") response.data = frappe.response['filecontent'] return response From 5ffdeb19fc6d76402638c171cdbcc900dad5ce2d Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 24 Jan 2019 14:26:27 +0530 Subject: [PATCH 06/35] feat: New filter type "Is Set", "Is Not Set" --- frappe/model/db_query.py | 14 +++++++++++++- .../js/frappe/ui/filters/edit_filter.html | 18 +++--------------- frappe/public/js/frappe/ui/filters/filter.js | 16 ++++++++++++++-- frappe/utils/data.py | 3 ++- 4 files changed, 32 insertions(+), 19 deletions(-) diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py index ca7558c77a..116255106c 100644 --- a/frappe/model/db_query.py +++ b/frappe/model/db_query.py @@ -409,6 +409,19 @@ class DatabaseQuery(object): value = get_time(f.value).strftime("%H:%M:%S.%f") fallback = "'00:00:00'" + elif f.operator.lower() == "is": + if f.value == 'set': + f.operator = '!=' + elif f.value == 'not set': + f.operator = '=' + + value = "" + fallback = '""' + can_be_null = True + + if 'ifnull' not in column_name: + column_name = 'ifnull({}, {})'.format(column_name, fallback) + elif f.operator.lower() in ("like", "not like") or (isinstance(f.value, string_types) and (not df or df.fieldtype not in ["Float", "Int", "Currency", "Percent", "Check"])): value = "" if f.value==None else f.value @@ -417,7 +430,6 @@ class DatabaseQuery(object): if f.operator.lower() in ("like", "not like") and isinstance(value, string_types): # because "like" uses backslash (\) for escaping value = value.replace("\\", "\\\\").replace("%", "%%") - else: value = flt(f.value) fallback = 0 diff --git a/frappe/public/js/frappe/ui/filters/edit_filter.html b/frappe/public/js/frappe/ui/filters/edit_filter.html index 88f3a5b20c..50b1e1b4e6 100644 --- a/frappe/public/js/frappe/ui/filters/edit_filter.html +++ b/frappe/public/js/frappe/ui/filters/edit_filter.html @@ -3,21 +3,9 @@
diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js index 1cbbc5fc2d..6b1be4bd0f 100644 --- a/frappe/public/js/frappe/ui/filters/filter.js +++ b/frappe/public/js/frappe/ui/filters/filter.js @@ -13,13 +13,16 @@ frappe.ui.Filter = class { ["not like", __("Not Like")], ["in", __("In")], ["not in", __("Not In")], + ["is", __("Is")], [">", ">"], ["<", "<"], [">=", ">="], ["<=", "<="], ["Between", __("Between")], ["descendants of", __("Descendants Of")], - ["ancestors of", __("Ancestors Of")] + ["not descendants of", __("Not Descendants Of")], + ["ancestors of", __("Ancestors Of")], + ["not ancestors of", __("Not Ancestors Of")] ]; this.invalid_condition_map = { Date: ['like', 'not like'], @@ -37,7 +40,9 @@ frappe.ui.Filter = class { } make() { - this.filter_edit_area = $(frappe.render_template("edit_filter", {})) + this.filter_edit_area = $(frappe.render_template("edit_filter", { + conditions: this.conditions + })) .appendTo(this.parent.find('.filter-edit-area')); } @@ -395,5 +400,12 @@ frappe.ui.filter_utils = { if(condition == "Between" && (df.fieldtype == 'Date' || df.fieldtype == 'Datetime')){ df.fieldtype = 'DateRange'; } + if (condition === 'is') { + df.fieldtype = 'Select' + df.options = [ + { label: __('Set'), value: 'set' }, + { label: __('Not Set'), value: 'not set' }, + ] + } } }; diff --git a/frappe/utils/data.py b/frappe/utils/data.py index dd3d9e3c94..3e92d3e5b9 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -835,7 +835,8 @@ def get_filter(doctype, f): f.operator = "=" valid_operators = ("=", "!=", ">", "<", ">=", "<=", "like", "not like", "in", "not in", - "between", "descendants of", "ancestors of", "not descendants of", "not ancestors of") + "between", "descendants of", "ancestors of", "not descendants of", "not ancestors of", "is") + if f.operator.lower() not in valid_operators: frappe.throw(frappe._("Operator must be one of {0}").format(", ".join(valid_operators))) From 2b336c235c1e2ab15881179009def4cf15754d0c Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 24 Jan 2019 14:43:44 +0530 Subject: [PATCH 07/35] tests: Add tests for "Is Set" and "Is Not Set" filter --- frappe/tests/test_db_query.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/frappe/tests/test_db_query.py b/frappe/tests/test_db_query.py index 132fb0d01d..484b17e024 100644 --- a/frappe/tests/test_db_query.py +++ b/frappe/tests/test_db_query.py @@ -336,6 +336,17 @@ class TestReportview(unittest.TestCase): self.assertTrue(len(frappe.get_all('File', {'name': ('not ancestors of', 'Home')})) == len(frappe.get_all('File'))) + def test_is_set_is_not_set(self): + res = DatabaseQuery("DocType").execute(filters={"autoname": ["is", "not set"]}) + self.assertTrue({'name': 'Integration Request'} in res) + self.assertTrue({'name': 'User'} in res) + self.assertFalse({'name': 'Blogger'} in res) + + res = DatabaseQuery("DocType").execute(filters={"autoname": ["is", "set"]}) + self.assertTrue({'name': 'DocField'} in res) + self.assertTrue({'name': 'Prepared Report'} in res) + self.assertFalse({'name': 'Property Setter'} in res) + def create_event(subject="_Test Event", starts_on=None): """ create a test event """ From 5f5ea18a72b7a6f33efd10e124f1864544c9dd4a Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 24 Jan 2019 15:13:13 +0530 Subject: [PATCH 08/35] style: missing semicolon --- frappe/public/js/frappe/ui/filters/filter.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js index 6b1be4bd0f..80ccb8b35b 100644 --- a/frappe/public/js/frappe/ui/filters/filter.js +++ b/frappe/public/js/frappe/ui/filters/filter.js @@ -401,11 +401,11 @@ frappe.ui.filter_utils = { df.fieldtype = 'DateRange'; } if (condition === 'is') { - df.fieldtype = 'Select' + df.fieldtype = 'Select'; df.options = [ { label: __('Set'), value: 'set' }, { label: __('Not Set'), value: 'not set' }, - ] + ]; } } }; From 75f8847ad49c78290ac3b1b23c2aae436e316a18 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 24 Jan 2019 19:15:49 +0530 Subject: [PATCH 09/35] fix: Skip get_notifications before setup_complete (#6828) --- frappe/desk/notifications.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/desk/notifications.py b/frappe/desk/notifications.py index 7a5676cca6..b13bc3e9d4 100644 --- a/frappe/desk/notifications.py +++ b/frappe/desk/notifications.py @@ -11,7 +11,8 @@ import json @frappe.whitelist() def get_notifications(): - if frappe.flags.in_install: + if (frappe.flags.in_install or + not frappe.db.get_single_value('System Settings', 'setup_complete')): return config = get_notification_config() From 14911900c8d71b931e501b79c37192714fe18ff4 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 24 Jan 2019 19:56:03 +0530 Subject: [PATCH 10/35] fix: return empty dict if site is in installation state or setup wiz not completed --- frappe/desk/notifications.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/notifications.py b/frappe/desk/notifications.py index b13bc3e9d4..bcd1911107 100644 --- a/frappe/desk/notifications.py +++ b/frappe/desk/notifications.py @@ -13,7 +13,7 @@ import json def get_notifications(): if (frappe.flags.in_install or not frappe.db.get_single_value('System Settings', 'setup_complete')): - return + return { } config = get_notification_config() From 97152b5a1e77ee3d5b53e204c64b4645a78d18b8 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Fri, 25 Jan 2019 10:22:13 +0530 Subject: [PATCH 11/35] fix: return empty dict if setup wizard is not completed (#6830) --- frappe/desk/notifications.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/frappe/desk/notifications.py b/frappe/desk/notifications.py index bcd1911107..2107cbdbec 100644 --- a/frappe/desk/notifications.py +++ b/frappe/desk/notifications.py @@ -13,7 +13,13 @@ import json def get_notifications(): if (frappe.flags.in_install or not frappe.db.get_single_value('System Settings', 'setup_complete')): - return { } + return { + "open_count_doctype": {}, + "open_count_module": {}, + "open_count_other": {}, + "targets": {}, + "new_messages": [] + } config = get_notification_config() From d8187a3f9d54f557438d4cb3a4c2b530e1a74add Mon Sep 17 00:00:00 2001 From: Zarrar Date: Fri, 25 Jan 2019 10:24:40 +0530 Subject: [PATCH 12/35] fix: unicode character throws error for python 2 (#6822) --- frappe/desk/reportview.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py index 7c6e7a4b75..fef0db9f74 100644 --- a/frappe/desk/reportview.py +++ b/frappe/desk/reportview.py @@ -214,7 +214,7 @@ def delete_items(): """delete selected items""" import json - il = sorted(json.loads(frappe.form_dict.get('items')), reverse=True, key=str) + il = sorted(json.loads(frappe.form_dict.get('items')), reverse=True, key=frappe.safe_decode) doctype = frappe.form_dict.get('doctype') failed = [] From 3250553738118e930a632105ea6d48c4926dd498 Mon Sep 17 00:00:00 2001 From: Chinmay Pai Date: Fri, 25 Jan 2019 05:49:17 +0000 Subject: [PATCH 13/35] fix(notifications): ignore mysql internal error 1684 for concurrent ddl statements (#6826) apparently this occurs when get_notifcations is called, and at the same time, a table is being modified. to fix this, we just skip the table that is currently being modified. Signed-off-by: Chinmay Pai --- frappe/desk/notifications.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/desk/notifications.py b/frappe/desk/notifications.py index 2107cbdbec..59c783c524 100644 --- a/frappe/desk/notifications.py +++ b/frappe/desk/notifications.py @@ -114,7 +114,8 @@ def get_notifications_for_doctypes(config, notification_count): except Exception as e: # OperationalError: (1412, 'Table definition has changed, please retry transaction') - if e.args[0]!=1412: + # InternalError: (1684, 'Table definition is being modified by concurrent DDL statement') + if e.args[0] not in (1412, 1684): raise else: @@ -154,7 +155,7 @@ def get_notifications_for_targets(config, notification_percent): frappe.clear_messages() pass except Exception as e: - if e.args[0]!=1412: + if e.args[0] not in (1412, 1684): raise else: From cc033a67ebd527d2c3b1e5131649f3ca923bbb0b Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Fri, 25 Jan 2019 11:19:57 +0530 Subject: [PATCH 14/35] fix(PrintFormat): Section Labels with spaces in them got truncated (#6819) --- .../page/print_format_builder/print_format_builder_section.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/printing/page/print_format_builder/print_format_builder_section.html b/frappe/printing/page/print_format_builder/print_format_builder_section.html index f5a96faede..d08a7ca5b2 100644 --- a/frappe/printing/page/print_format_builder/print_format_builder_section.html +++ b/frappe/printing/page/print_format_builder/print_format_builder_section.html @@ -1,4 +1,4 @@ -
+
From 94d048967414f66c0798e45b412cebb3082a4bc0 Mon Sep 17 00:00:00 2001 From: Zarrar Date: Fri, 25 Jan 2019 11:21:10 +0530 Subject: [PATCH 15/35] fix: Customize Form and Custom DocType related fixes (#6645) * display Customize option in menu bar only for standard DocType * disallow opening of custom doctype in Customize Form * make fields dependent on is_submittable property visible for child table * throw message that custom fields can only be added to standard doctype * set query similar to the one in Customize Form for DocType selection * only hide customize option [fix] * add core doctypes list in model and use it from there * avoid editing of core doctype from Customize Form or Custom Field * test case updated and additional test for core doctypes added * codacy fix --- .../doctype/custom_field/custom_field.js | 23 +++-- .../doctype/custom_field/custom_field.py | 9 ++ .../doctype/customize_form/customize_form.js | 14 ++-- .../doctype/customize_form/customize_form.py | 8 +- .../customize_form/test_customize_form.py | 83 ++++++++++--------- frappe/model/__init__.py | 3 + frappe/public/js/frappe/form/layout.js | 3 + frappe/public/js/frappe/list/list_view.js | 12 +-- frappe/public/js/frappe/model/model.js | 4 + 9 files changed, 103 insertions(+), 56 deletions(-) diff --git a/frappe/custom/doctype/custom_field/custom_field.js b/frappe/custom/doctype/custom_field/custom_field.js index c430d12752..c59fabeaa6 100644 --- a/frappe/custom/doctype/custom_field/custom_field.js +++ b/frappe/custom/doctype/custom_field/custom_field.js @@ -9,6 +9,9 @@ frappe.ui.form.on('Custom Field', { frm.set_query('dt', function(doc) { var filters = [ ['DocType', 'issingle', '=', 0], + ['DocType', 'custom', '=', 0], + ['DocType', 'name', 'not in', frappe.model.core_doctypes_list], + ['DocType', 'restrict_to_domain', 'in', frappe.boot.active_domains] ]; if(frappe.session.user!=="Administrator") { filters.push(['DocType', 'module', 'not in', ['Core', 'Custom']]) @@ -32,15 +35,21 @@ frappe.ui.form.on('Custom Field', { return frappe.call({ method: 'frappe.custom.doctype.custom_field.custom_field.get_fields_label', args: { doctype: frm.doc.dt, fieldname: frm.doc.fieldname }, - callback: function(r, rt) { - set_field_options('insert_after', r.message); - var fieldnames = $.map(r.message, function(v) { return v.value; }); + callback: function(r) { + if(r) { + if(r._server_messages && r._server_messages.length) { + frm.set_value("dt", ""); + } else { + set_field_options('insert_after', r.message); + var fieldnames = $.map(r.message, function(v) { return v.value; }); - if(insert_after==null || !in_list(fieldnames, insert_after)) { - insert_after = fieldnames[-1]; + if(insert_after==null || !in_list(fieldnames, insert_after)) { + insert_after = fieldnames[-1]; + } + + frm.set_value('insert_after', insert_after); + } } - - frm.set_value('insert_after', insert_after); } }); diff --git a/frappe/custom/doctype/custom_field/custom_field.py b/frappe/custom/doctype/custom_field/custom_field.py index dbab4eadcb..35ec34fc12 100644 --- a/frappe/custom/doctype/custom_field/custom_field.py +++ b/frappe/custom/doctype/custom_field/custom_field.py @@ -7,6 +7,7 @@ import json from frappe.utils import cstr from frappe import _ from frappe.model.document import Document +from frappe.model import core_doctypes_list class CustomField(Document): def autoname(self): @@ -82,6 +83,14 @@ class CustomField(Document): @frappe.whitelist() def get_fields_label(doctype=None): + meta = frappe.get_meta(doctype) + + if doctype in core_doctypes_list: + return frappe.msgprint(_("Custom Fields cannot be added to core DocTypes.")) + + if meta.custom: + return frappe.msgprint(_("Custom Fields can only be added to a standard DocType.")) + return [{"value": df.fieldname or "", "label": _(df.label or "")} for df in frappe.get_meta(doctype).get("fields")] diff --git a/frappe/custom/doctype/customize_form/customize_form.js b/frappe/custom/doctype/customize_form/customize_form.js index 227c6de1ee..125db507ea 100644 --- a/frappe/custom/doctype/customize_form/customize_form.js +++ b/frappe/custom/doctype/customize_form/customize_form.js @@ -13,9 +13,7 @@ frappe.ui.form.on("Customize Form", { filters: [ ['DocType', 'issingle', '=', 0], ['DocType', 'custom', '=', 0], - ['DocType', 'name', 'not in', 'DocType, DocField, DocPerm, User, Role, Has Role, \ - Page, Has Role, Module Def, Print Format, Report, Customize Form, \ - Customize Form Field, Property Setter, Custom Field, Custom Script'], + ['DocType', 'name', 'not in', frappe.model.core_doctypes_list], ['DocType', 'restrict_to_domain', 'in', frappe.boot.active_domains] ] }; @@ -39,8 +37,14 @@ frappe.ui.form.on("Customize Form", { doc: frm.doc, freeze: true, callback: function(r) { - frm.refresh(); - frm.trigger("setup_sortable"); + if(r) { + if(r._server_messages && r._server_messages.length) { + frm.set_value("doc_type", ""); + } else { + frm.refresh(); + frm.trigger("setup_sortable"); + } + } } }); } else { diff --git a/frappe/custom/doctype/customize_form/customize_form.py b/frappe/custom/doctype/customize_form/customize_form.py index abcccd1070..1c05cc7253 100644 --- a/frappe/custom/doctype/customize_form/customize_form.py +++ b/frappe/custom/doctype/customize_form/customize_form.py @@ -11,7 +11,7 @@ import frappe.translate from frappe import _ from frappe.utils import cint from frappe.model.document import Document -from frappe.model import no_value_fields +from frappe.model import no_value_fields, core_doctypes_list from frappe.core.doctype.doctype.doctype import validate_fields_for_doctype doctype_properties = { @@ -82,6 +82,12 @@ class CustomizeForm(Document): meta = frappe.get_meta(self.doc_type) + if self.doc_type in core_doctypes_list: + return frappe.msgprint(_("Core DocTypes cannot be customized.")) + + if meta.custom: + return frappe.msgprint(_("Only standard DocTypes are allowed to be customized from Customize Form.")) + # doctype properties for property in doctype_properties: self.set(property, meta.get(property)) diff --git a/frappe/custom/doctype/customize_form/test_customize_form.py b/frappe/custom/doctype/customize_form/test_customize_form.py index 87f0a6324f..763b9cd5a0 100644 --- a/frappe/custom/doctype/customize_form/test_customize_form.py +++ b/frappe/custom/doctype/customize_form/test_customize_form.py @@ -9,28 +9,28 @@ from frappe.core.doctype.doctype.doctype import InvalidFieldNameError test_dependencies = ["Custom Field", "Property Setter"] class TestCustomizeForm(unittest.TestCase): def insert_custom_field(self): - frappe.delete_doc_if_exists("Custom Field", "User-test_custom_field") + frappe.delete_doc_if_exists("Custom Field", "Event-test_custom_field") frappe.get_doc({ "doctype": "Custom Field", - "dt": "User", + "dt": "Event", "label": "Test Custom Field", "description": "A Custom Field for Testing", "fieldtype": "Select", "in_list_view": 1, "options": "\nCustom 1\nCustom 2\nCustom 3", "default": "Custom 3", - "insert_after": frappe.get_meta('User').fields[-1].fieldname + "insert_after": frappe.get_meta('Event').fields[-1].fieldname }).insert() def setUp(self): self.insert_custom_field() frappe.db.commit() - frappe.clear_cache(doctype="User") + frappe.clear_cache(doctype="Event") def tearDown(self): - frappe.delete_doc("Custom Field", "User-test_custom_field") + frappe.delete_doc("Custom Field", "Event-test_custom_field") frappe.db.commit() - frappe.clear_cache(doctype="User") + frappe.clear_cache(doctype="Event") def get_customize_form(self, doctype=None): d = frappe.get_doc("Customize Form") @@ -46,66 +46,66 @@ class TestCustomizeForm(unittest.TestCase): d = self.get_customize_form("Event") self.assertEquals(d.doc_type, "Event") - self.assertEquals(len(d.get("fields")), 29) + self.assertEquals(len(d.get("fields")), 30) - d = self.get_customize_form("User") - self.assertEquals(d.doc_type, "User") + d = self.get_customize_form("Event") + self.assertEquals(d.doc_type, "Event") self.assertEquals(len(d.get("fields")), len(frappe.get_doc("DocType", d.doc_type).fields) + 1) self.assertEquals(d.get("fields")[-1].fieldname, "test_custom_field") - self.assertEquals(d.get("fields", {"fieldname": "location"})[0].in_list_view, 1) + self.assertEquals(d.get("fields", {"fieldname": "event_type"})[0].in_list_view, 1) return d def test_save_customization_property(self): - d = self.get_customize_form("User") + d = self.get_customize_form("Event") self.assertEquals(frappe.db.get_value("Property Setter", - {"doc_type": "User", "property": "allow_copy"}, "value"), None) + {"doc_type": "Event", "property": "allow_copy"}, "value"), None) d.allow_copy = 1 d.run_method("save_customization") self.assertEquals(frappe.db.get_value("Property Setter", - {"doc_type": "User", "property": "allow_copy"}, "value"), '1') + {"doc_type": "Event", "property": "allow_copy"}, "value"), '1') d.allow_copy = 0 d.run_method("save_customization") self.assertEquals(frappe.db.get_value("Property Setter", - {"doc_type": "User", "property": "allow_copy"}, "value"), None) + {"doc_type": "Event", "property": "allow_copy"}, "value"), None) def test_save_customization_field_property(self): - d = self.get_customize_form("User") + d = self.get_customize_form("Event") self.assertEquals(frappe.db.get_value("Property Setter", - {"doc_type": "User", "property": "reqd", "field_name": "location"}, "value"), None) + {"doc_type": "Event", "property": "reqd", "field_name": "repeat_this_event"}, "value"), None) - location_field = d.get("fields", {"fieldname": "location"})[0] - location_field.reqd = 1 + repeat_this_event_field = d.get("fields", {"fieldname": "repeat_this_event"})[0] + repeat_this_event_field.reqd = 1 d.run_method("save_customization") self.assertEquals(frappe.db.get_value("Property Setter", - {"doc_type": "User", "property": "reqd", "field_name": "location"}, "value"), '1') + {"doc_type": "Event", "property": "reqd", "field_name": "repeat_this_event"}, "value"), '1') - location_field = d.get("fields", {"fieldname": "location"})[0] - location_field.reqd = 0 + repeat_this_event_field = d.get("fields", {"fieldname": "repeat_this_event"})[0] + repeat_this_event_field.reqd = 0 d.run_method("save_customization") self.assertEquals(frappe.db.get_value("Property Setter", - {"doc_type": "User", "property": "reqd", "field_name": "location"}, "value"), None) + {"doc_type": "Event", "property": "reqd", "field_name": "repeat_this_event"}, "value"), None) def test_save_customization_custom_field_property(self): - d = self.get_customize_form("User") - self.assertEquals(frappe.db.get_value("Custom Field", "User-test_custom_field", "reqd"), 0) + d = self.get_customize_form("Event") + self.assertEquals(frappe.db.get_value("Custom Field", "Event-test_custom_field", "reqd"), 0) custom_field = d.get("fields", {"fieldname": "test_custom_field"})[0] custom_field.reqd = 1 d.run_method("save_customization") - self.assertEquals(frappe.db.get_value("Custom Field", "User-test_custom_field", "reqd"), 1) + self.assertEquals(frappe.db.get_value("Custom Field", "Event-test_custom_field", "reqd"), 1) custom_field = d.get("fields", {"is_custom_field": True})[0] custom_field.reqd = 0 d.run_method("save_customization") - self.assertEquals(frappe.db.get_value("Custom Field", "User-test_custom_field", "reqd"), 0) + self.assertEquals(frappe.db.get_value("Custom Field", "Event-test_custom_field", "reqd"), 0) def test_save_customization_new_field(self): - d = self.get_customize_form("User") + d = self.get_customize_form("Event") last_fieldname = d.fields[-1].fieldname d.append("fields", { "label": "Test Add Custom Field Via Customize Form", @@ -114,18 +114,18 @@ class TestCustomizeForm(unittest.TestCase): }) d.run_method("save_customization") self.assertEquals(frappe.db.get_value("Custom Field", - "User-test_add_custom_field_via_customize_form", "fieldtype"), "Data") + "Event-test_add_custom_field_via_customize_form", "fieldtype"), "Data") self.assertEquals(frappe.db.get_value("Custom Field", - "User-test_add_custom_field_via_customize_form", 'insert_after'), last_fieldname) + "Event-test_add_custom_field_via_customize_form", 'insert_after'), last_fieldname) - frappe.delete_doc("Custom Field", "User-test_add_custom_field_via_customize_form") + frappe.delete_doc("Custom Field", "Event-test_add_custom_field_via_customize_form") self.assertEquals(frappe.db.get_value("Custom Field", - "User-test_add_custom_field_via_customize_form"), None) + "Event-test_add_custom_field_via_customize_form"), None) def test_save_customization_remove_field(self): - d = self.get_customize_form("User") + d = self.get_customize_form("Event") custom_field = d.get("fields", {"fieldname": "test_custom_field"})[0] d.get("fields").remove(custom_field) d.run_method("save_customization") @@ -137,24 +137,24 @@ class TestCustomizeForm(unittest.TestCase): def test_reset_to_defaults(self): d = frappe.get_doc("Customize Form") - d.doc_type = "User" + d.doc_type = "Event" d.run_method('reset_to_defaults') - self.assertEquals(d.get("fields", {"fieldname": "location"})[0].in_list_view, 0) + self.assertEquals(d.get("fields", {"fieldname": "repeat_this_event"})[0].in_list_view, 0) frappe.local.test_objects["Property Setter"] = [] make_test_records_for_doctype("Property Setter") def test_set_allow_on_submit(self): - d = self.get_customize_form("User") - d.get("fields", {"fieldname": "first_name"})[0].allow_on_submit = 1 + d = self.get_customize_form("Event") + d.get("fields", {"fieldname": "subject"})[0].allow_on_submit = 1 d.get("fields", {"fieldname": "test_custom_field"})[0].allow_on_submit = 1 d.run_method("save_customization") - d = self.get_customize_form("User") + d = self.get_customize_form("Event") # don't allow for standard fields - self.assertEquals(d.get("fields", {"fieldname": "first_name"})[0].allow_on_submit or 0, 0) + self.assertEquals(d.get("fields", {"fieldname": "subject"})[0].allow_on_submit or 0, 0) # allow for custom field self.assertEquals(d.get("fields", {"fieldname": "test_custom_field"})[0].allow_on_submit, 1) @@ -184,3 +184,10 @@ class TestCustomizeForm(unittest.TestCase): df.default = None d.run_method("save_customization") + def test_core_doctype_customization(self): + d = self.get_customize_form('User') + e = self.get_customize_form('Custom Field') + + # core doctype is invalid, hence no attributes are set + self.assertEquals(d.get("fields"), []) + self.assertEquals(e.get("fields"), []) diff --git a/frappe/model/__init__.py b/frappe/model/__init__.py index 441a20733a..26e91e7117 100644 --- a/frappe/model/__init__.py +++ b/frappe/model/__init__.py @@ -13,6 +13,9 @@ display_fieldtypes = ('Section Break', 'Column Break', 'HTML', 'Button', 'Image' default_fields = ('doctype','name','owner','creation','modified','modified_by', 'parent','parentfield','parenttype','idx','docstatus') optional_fields = ("_user_tags", "_comments", "_assign", "_liked_by", "_seen") +core_doctypes_list = ('DocType', 'DocField', 'DocPerm', 'User', 'Role', 'Has Role', + 'Page', 'Module Def', 'Print Format', 'Report', 'Customize Form', + 'Customize Form Field', 'Property Setter', 'Custom Field', 'Custom Script') def copytables(srctype, src, srcfield, tartype, tar, tarfield, srcfields, tarfields=[]): if not tarfields: diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js index 9b559a644b..0719f6c7fa 100644 --- a/frappe/public/js/frappe/form/layout.js +++ b/frappe/public/js/frappe/form/layout.js @@ -485,6 +485,9 @@ frappe.ui.form.Layout = Class.extend({ if(expression.substr(0,5)=='eval:') { try { out = eval(expression.substr(5)); + if(parent && parent.istable && expression.includes('is_submittable')) { + out = true; + } } catch(e) { frappe.throw(__('Invalid "depends_on" expression')); } diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index 881c1b62ca..0bba54a5fa 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -619,11 +619,13 @@ frappe.views.ListView = frappe.ui.BaseList.extend({ doctype: me.doctype }); }, true); - this.page.add_menu_item(__('Customize'), function () { - frappe.set_route('Form', 'Customize Form', { - doc_type: me.doctype - }) - }, true); + if(this.meta && !this.meta.custom) { + this.page.add_menu_item(__('Customize'), function () { + frappe.set_route('Form', 'Customize Form', { + doc_type: me.doctype + }) + }, true); + } } this.make_bulk_assignment(); diff --git a/frappe/public/js/frappe/model/model.js b/frappe/public/js/frappe/model/model.js index a947483d25..74486a046a 100644 --- a/frappe/public/js/frappe/model/model.js +++ b/frappe/public/js/frappe/model/model.js @@ -13,6 +13,10 @@ $.extend(frappe.model, { '_user_tags', '_comments', '_assign', '_liked_by', 'docstatus', 'parent', 'parenttype', 'parentfield', 'idx'], + core_doctypes_list: ['DocType', 'DocField', 'DocPerm', 'User', 'Role', 'Has Role', + 'Page', 'Module Def', 'Print Format', 'Report', 'Customize Form', + 'Customize Form Field', 'Property Setter', 'Custom Field', 'Custom Script'], + std_fields: [ {fieldname:'name', fieldtype:'Link', label:__('ID')}, {fieldname:'owner', fieldtype:'Link', label:__('Created By'), options: 'User'}, From 37393399cee3f778b9d814944c702475e3863861 Mon Sep 17 00:00:00 2001 From: Anurag Mishra <32095923+Anurag810@users.noreply.github.com> Date: Fri, 25 Jan 2019 11:28:24 +0530 Subject: [PATCH 16/35] fix: offset in calendar view (#6815) --- frappe/public/js/frappe/views/calendar/calendar.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/views/calendar/calendar.js b/frappe/public/js/frappe/views/calendar/calendar.js index d7a93de572..31ea1379fb 100644 --- a/frappe/public/js/frappe/views/calendar/calendar.js +++ b/frappe/public/js/frappe/views/calendar/calendar.js @@ -17,7 +17,7 @@ frappe.views.CalendarView = class CalendarView extends frappe.views.ListView { return false; } } - + toggle_result_area() {} get view_name() { @@ -205,7 +205,7 @@ frappe.views.Calendar = Class.extend({ "default": "blue" }, get_system_datetime: function(date) { - date._offset = moment.user_utc_offset; + date._offset = (moment(date).tz(frappe.sys_defaults.time_zone)._offset); return frappe.datetime.convert_to_system_tz(date); }, setup_options: function(defaults) { From 51fc91563d6b2ef591250550e3bbb137f008e35d Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Fri, 25 Jan 2019 11:53:47 +0530 Subject: [PATCH 17/35] feat(email): Check Send Read Receipt checkbox by default (#6817) --- frappe/public/js/frappe/views/communication.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js index 027f1fd1b7..371af5a514 100755 --- a/frappe/public/js/frappe/views/communication.js +++ b/frappe/public/js/frappe/views/communication.js @@ -92,7 +92,7 @@ frappe.views.CommunicationComposer = Class.extend({ {label:__("Send me a copy"), fieldtype:"Check", fieldname:"send_me_a_copy", 'default': frappe.boot.user.send_me_a_copy}, {label:__("Send Read Receipt"), fieldtype:"Check", - fieldname:"send_read_receipt"}, + fieldname:"send_read_receipt", default: 1}, {label:__("Attach Document Print"), fieldtype:"Check", fieldname:"attach_document_print"}, {label:__("Select Print Format"), fieldtype:"Select", From d5cd34457e02d1e9878bea70f64a4cd5e060cb89 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Fri, 25 Jan 2019 11:54:55 +0530 Subject: [PATCH 18/35] fix: Bypass filters that cannot be applied (#6818) Use case: When you enable Workflow for any DocType, it's status is now tracked by `workflow_field` and not `docstatus`. When you navigate from Notification dropdown, it applied a `docstatus` filter on the List View which cannot be applied. This can be ignored and user can apply his own filters. --- frappe/public/js/frappe/ui/filters/filter.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js index 1cbbc5fc2d..8922bd9b0b 100644 --- a/frappe/public/js/frappe/ui/filters/filter.js +++ b/frappe/public/js/frappe/ui/filters/filter.js @@ -125,7 +125,9 @@ frappe.ui.Filter = class { set_values(doctype, fieldname, condition, value) { // presents given (could be via tags!) - this.set_field(doctype, fieldname); + if (this.set_field(doctype, fieldname) === false) { + return + } if(this.field.df.original_type==='Check') { value = (value==1) ? 'Yes' : 'No'; @@ -154,9 +156,9 @@ frappe.ui.Filter = class { let original_docfield = (this.fieldselect.fields_by_name[doctype] || {})[fieldname]; if(!original_docfield) { - frappe.msgprint(__("Field {0} is not selectable.", [fieldname])); + console.warn(`Field ${fieldname} is not selectable.`); this.remove(); - return; + return false; } let df = copy_dict(original_docfield); From 837bfc0995fbeacd96ae8fc68e34f770b48f6ae4 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Fri, 25 Jan 2019 11:56:27 +0530 Subject: [PATCH 19/35] fix(unicode): Import unicode_literals in every file (#6805) * fix(unicode): Import unicode_literals in every file * fix(unicode): Test if safe_json_loads return unicode instead of bytes --- frappe/chat/__init__.py | 1 + frappe/chat/doctype/chat_message/chat_message.py | 2 ++ .../chat/doctype/chat_message/test_chat_message.py | 2 ++ frappe/chat/doctype/chat_profile/chat_profile.py | 2 ++ .../chat/doctype/chat_profile/test_chat_profile.py | 6 ++++-- frappe/chat/doctype/chat_room/chat_room.py | 2 ++ .../chat/doctype/chat_room_user/chat_room_user.py | 2 ++ frappe/chat/util/__init__.py | 2 ++ frappe/chat/util/test_util.py | 9 ++++++--- frappe/chat/util/util.py | 14 ++++++++------ frappe/chat/website/__init__.py | 1 + .../test_addresses_and_contacts.py | 1 + frappe/core/doctype/docshare/test_docshare.py | 1 + frappe/core/utils.py | 1 + .../data_migration_connector/connectors/base.py | 1 + frappe/desk/doctype/note/test_note.py | 1 + frappe/desk/page/backups/backups.py | 1 + .../doctype/email_account/test_email_account.py | 1 + frappe/email/inbox.py | 1 + frappe/frappeclient.py | 1 + frappe/geo/doctype/country/test_country.py | 2 +- frappe/geo/doctype/currency/test_currency.py | 1 + .../gcalendar_to_event/__init__.py | 1 + .../doctype/social_login_keys/social_login_keys.py | 1 + frappe/integrations/doctype/webhook/__init__.py | 3 ++- frappe/model/dynamic_links.py | 5 +++-- frappe/model/utils/user_settings.py | 1 + frappe/modules/__init__.py | 1 + frappe/oauth.py | 1 + ...nable_chat_by_default_within_system_settings.py | 1 + frappe/patches/v10_0/enhance_security.py | 1 + .../v10_0/increase_single_table_column_length.py | 1 + frappe/patches/v10_0/migrate_passwords_passlib.py | 1 + frappe/patches/v10_0/modify_naming_series_table.py | 1 + .../v10_0/modify_smallest_currency_fraction.py | 1 + frappe/patches/v10_0/refactor_social_login_keys.py | 1 + .../v10_0/reload_countries_and_currencies.py | 1 + .../remove_custom_field_for_disabled_domain.py | 1 + frappe/patches/v10_0/set_default_locking_time.py | 1 + .../patches/v10_0/set_no_copy_to_workflow_state.py | 1 + .../v11_0/change_email_signature_fieldtype.py | 1 + .../patches/v11_0/copy_fetch_data_from_options.py | 1 + .../patches/v11_0/delete_all_prepared_reports.py | 1 + .../v11_0/delete_duplicate_user_permissions.py | 1 + .../v11_0/drop_column_apply_user_permissions.py | 1 + .../patches/v11_0/fix_order_by_in_reports_json.py | 1 + .../patches/v11_0/get_docs_apps_if_not_present.py | 1 + .../migrate_report_settings_for_new_listview.py | 1 + .../patches/v11_0/multiple_references_in_events.py | 1 + frappe/patches/v11_0/reload_and_rename_view_log.py | 1 + frappe/patches/v11_0/remove_skip_for_doctype.py | 1 + .../v11_0/rename_email_alert_to_notification.py | 1 + frappe/patches/v11_0/rename_google_maps_doctype.py | 13 +++++++------ .../rename_standard_reply_to_email_template.py | 1 + ...me_workflow_action_to_workflow_action_master.py | 1 + .../v11_0/replicate_old_user_permissions.py | 1 + .../v11_0/set_allow_self_approval_in_workflow.py | 1 + .../v11_0/sync_stripe_settings_before_migrate.py | 1 + .../sync_user_permission_doctype_before_migrate.py | 1 + .../v5_0/clear_website_group_and_notifications.py | 1 + frappe/patches/v5_0/communication_parent.py | 1 + frappe/patches/v5_0/expire_old_scheduler_logs.py | 1 + frappe/patches/v5_0/modify_session.py | 1 + ...move_scheduler_last_event_to_system_settings.py | 1 + frappe/patches/v5_0/rename_table_fieldnames.py | 1 + frappe/patches/v5_0/update_shared.py | 1 + frappe/patches/v6_0/document_type_rename.py | 1 + frappe/patches/v6_0/fix_ghana_currency.py | 1 + frappe/patches/v6_0/make_task_log_folder.py | 1 + frappe/patches/v6_1/rename_file_data.py | 2 +- .../patches/v6_11/rename_field_in_email_account.py | 1 + frappe/patches/v6_15/set_username.py | 1 + frappe/patches/v6_2/rename_backup_manager.py | 1 + .../v6_20x/remove_roles_from_website_user.py | 1 + frappe/patches/v6_20x/set_allow_draft_for_print.py | 1 + frappe/patches/v6_20x/update_insert_after.py | 1 + frappe/patches/v6_24/set_language_as_code.py | 1 + frappe/patches/v6_24/sync_desktop_icons.py | 1 + frappe/patches/v7_0/add_communication_in_doc.py | 1 + frappe/patches/v7_0/cleanup_list_settings.py | 1 + frappe/patches/v7_0/create_private_file_folder.py | 1 + .../desktop_icons_hidden_by_admin_as_blocked.py | 1 + frappe/patches/v7_0/re_route.py | 1 + .../v7_0/rename_bulk_email_to_email_queue.py | 1 + .../v7_0/rename_newsletter_list_to_email_group.py | 1 + frappe/patches/v7_0/set_user_fullname.py | 1 + .../v7_0/update_send_after_in_bulk_email.py | 1 + .../patches/v7_1/rename_chinese_language_codes.py | 1 + .../v7_1/rename_scheduler_log_to_error_log.py | 1 + frappe/patches/v7_1/sync_language_doctype.py | 1 + frappe/patches/v7_2/fix_email_queue_recipient.py | 1 + frappe/patches/v7_2/merge_knowledge_base.py | 1 + frappe/patches/v7_2/remove_in_filter.py | 1 + frappe/patches/v7_2/set_doctype_engine.py | 1 + .../v7_2/set_in_standard_filter_property.py | 1 + frappe/patches/v7_2/setup_custom_perms.py | 1 + frappe/patches/v7_2/setup_ldap_config.py | 1 + frappe/patches/v7_2/update_communications.py | 1 + frappe/patches/v7_2/update_feedback_request.py | 1 + .../patches/v8_0/deprecate_integration_broker.py | 1 + frappe/patches/v8_0/drop_in_dialog.py | 1 + frappe/patches/v8_0/drop_is_custom_from_docperm.py | 1 + .../v8_0/install_new_build_system_requirements.py | 1 + .../v8_0/rename_listsettings_to_usersettings.py | 1 + frappe/patches/v8_0/rename_print_to_printing.py | 1 + frappe/patches/v8_0/set_allow_traceback.py | 1 + frappe/patches/v8_0/setup_email_inbox.py | 1 + frappe/patches/v8_0/update_global_search_table.py | 1 + .../v8_0/update_published_in_global_search.py | 1 + .../v8_0/update_records_in_global_search.py | 1 + .../delete_custom_docperm_if_doctype_not_exists.py | 1 + frappe/patches/v8_x/update_user_permission.py | 1 + frappe/patches/v9_1/move_feed_to_activity_log.py | 1 + frappe/patches/v9_1/resave_domain_settings.py | 1 + frappe/patches/v9_1/revert_domain_settings.py | 1 + frappe/tests/test_patches.py | 1 + frappe/tests/ui/test_test_runner.py | 1 + frappe/tests/ui/test_todo.py | 1 + frappe/utils/html_utils.py | 1 + frappe/utils/identicon.py | 1 + frappe/utils/make_random.py | 1 + frappe/utils/minify.py | 1 + frappe/utils/reset_doc.py | 1 + .../doctype/website_theme/test_website_theme.py | 1 + frappe/website/purifycss.py | 1 + frappe/www/feedback.py | 1 + frappe/www/robots.py | 1 + setup.py | 2 ++ 128 files changed, 159 insertions(+), 22 deletions(-) diff --git a/frappe/chat/__init__.py b/frappe/chat/__init__.py index a1a2e9cb36..dea0030839 100644 --- a/frappe/chat/__init__.py +++ b/frappe/chat/__init__.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe import _ diff --git a/frappe/chat/doctype/chat_message/chat_message.py b/frappe/chat/doctype/chat_message/chat_message.py index 06127b3148..657009b2c1 100644 --- a/frappe/chat/doctype/chat_message/chat_message.py +++ b/frappe/chat/doctype/chat_message/chat_message.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + # imports - standard imports import json diff --git a/frappe/chat/doctype/chat_message/test_chat_message.py b/frappe/chat/doctype/chat_message/test_chat_message.py index fc4e750719..46dac9858c 100644 --- a/frappe/chat/doctype/chat_message/test_chat_message.py +++ b/frappe/chat/doctype/chat_message/test_chat_message.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + # imports - standard imports import unittest diff --git a/frappe/chat/doctype/chat_profile/chat_profile.py b/frappe/chat/doctype/chat_profile/chat_profile.py index 61475f877e..b5ec9a8be9 100644 --- a/frappe/chat/doctype/chat_profile/chat_profile.py +++ b/frappe/chat/doctype/chat_profile/chat_profile.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + # imports - module imports from frappe.model.document import Document from frappe import _ diff --git a/frappe/chat/doctype/chat_profile/test_chat_profile.py b/frappe/chat/doctype/chat_profile/test_chat_profile.py index a4f1bf359f..7c12b7179a 100644 --- a/frappe/chat/doctype/chat_profile/test_chat_profile.py +++ b/frappe/chat/doctype/chat_profile/test_chat_profile.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + # imports - standard imports import unittest @@ -16,7 +18,7 @@ class TestChatProfile(unittest.TestCase): # def test_create(self): # with self.assertRaises(frappe.ValidationError): # chat_profile.create(test_user) - + # user = get_user_doc(session.user) # if not user.chat_profile: # chat_profile.create(user.name) @@ -47,7 +49,7 @@ class TestChatProfile(unittest.TestCase): # )) # user = get_user_doc(session.user) - # prev = chat_profile.get(user.name) + # prev = chat_profile.get(user.name) # chat_profile.update(user.name, data = dict( # status = 'Offline' diff --git a/frappe/chat/doctype/chat_room/chat_room.py b/frappe/chat/doctype/chat_room/chat_room.py index 4de234f89b..db138ed08b 100644 --- a/frappe/chat/doctype/chat_room/chat_room.py +++ b/frappe/chat/doctype/chat_room/chat_room.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + # imports - standard imports import json diff --git a/frappe/chat/doctype/chat_room_user/chat_room_user.py b/frappe/chat/doctype/chat_room_user/chat_room_user.py index f6dbdc7659..f8e13add82 100644 --- a/frappe/chat/doctype/chat_room_user/chat_room_user.py +++ b/frappe/chat/doctype/chat_room_user/chat_room_user.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + # imports - module imports from frappe.model.document import Document import frappe diff --git a/frappe/chat/util/__init__.py b/frappe/chat/util/__init__.py index 383df581cd..15977af566 100644 --- a/frappe/chat/util/__init__.py +++ b/frappe/chat/util/__init__.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + # imports - module imports from frappe.chat.util.util import ( get_user_doc, diff --git a/frappe/chat/util/test_util.py b/frappe/chat/util/test_util.py index 8b07a1ca08..6d44a63d31 100644 --- a/frappe/chat/util/test_util.py +++ b/frappe/chat/util/test_util.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + # imports - standard imports import unittest @@ -7,6 +9,7 @@ from frappe.chat.util import ( safe_json_loads ) import frappe +import six class TestChatUtil(unittest.TestCase): def test_safe_json_loads(self): @@ -15,10 +18,10 @@ class TestChatUtil(unittest.TestCase): number = safe_json_loads("1.0") self.assertEqual(type(number), float) - + string = safe_json_loads("foobar") - self.assertEqual(type(string), str) - + self.assertEqual(type(string), six.text_type) + array = safe_json_loads('[{ "foo": "bar" }]') self.assertEqual(type(array), list) diff --git a/frappe/chat/util/util.py b/frappe/chat/util/util.py index c071cfa17e..5aa80a85ae 100644 --- a/frappe/chat/util/util.py +++ b/frappe/chat/util/util.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + # imports - third-party imports import requests @@ -26,7 +28,7 @@ def get_user_doc(user = None): user = user or session.user user = frappe.get_doc('User', user) - + return user def squashify(what): @@ -43,9 +45,9 @@ def safe_json_loads(*args): arg = json.loads(arg) except Exception as e: pass - + results.append(arg) - + return squashify(results) def filter_dict(what, keys, ignore = False): @@ -68,7 +70,7 @@ def get_if_empty(a, b): if not a: a = b return a - + def listify(arg): if not isinstance(arg, list): arg = [arg] @@ -89,7 +91,7 @@ def check_url(what, raise_err = False): raise ValueError('{what} not a valid URL.') else: return False - + return True def create_test_user(module): @@ -110,5 +112,5 @@ def get_emojis(): if resp.ok: emojis = resp.json() redis.hset('frappe_emojis', 'emojis', emojis) - + return dictify(emojis) \ No newline at end of file diff --git a/frappe/chat/website/__init__.py b/frappe/chat/website/__init__.py index 4b8d2283df..f33f531cbf 100644 --- a/frappe/chat/website/__init__.py +++ b/frappe/chat/website/__init__.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.chat.util import filter_dict, safe_json_loads diff --git a/frappe/contacts/report/addresses_and_contacts/test_addresses_and_contacts.py b/frappe/contacts/report/addresses_and_contacts/test_addresses_and_contacts.py index 1d202d8379..b375874655 100644 --- a/frappe/contacts/report/addresses_and_contacts/test_addresses_and_contacts.py +++ b/frappe/contacts/report/addresses_and_contacts/test_addresses_and_contacts.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe import frappe.defaults import unittest diff --git a/frappe/core/doctype/docshare/test_docshare.py b/frappe/core/doctype/docshare/test_docshare.py index 10986d9eae..697930d6b5 100644 --- a/frappe/core/doctype/docshare/test_docshare.py +++ b/frappe/core/doctype/docshare/test_docshare.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # See license.txt +from __future__ import unicode_literals import frappe import frappe.share import unittest diff --git a/frappe/core/utils.py b/frappe/core/utils.py index 42193d0cb9..e4c349da93 100644 --- a/frappe/core/utils.py +++ b/frappe/core/utils.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # MIT License. See license.txt +from __future__ import unicode_literals import frappe diff --git a/frappe/data_migration/doctype/data_migration_connector/connectors/base.py b/frappe/data_migration/doctype/data_migration_connector/connectors/base.py index f500b4a7e8..97f9f5f4a3 100644 --- a/frappe/data_migration/doctype/data_migration_connector/connectors/base.py +++ b/frappe/data_migration/doctype/data_migration_connector/connectors/base.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from six import with_metaclass from abc import ABCMeta, abstractmethod from frappe.utils.password import get_decrypted_password diff --git a/frappe/desk/doctype/note/test_note.py b/frappe/desk/doctype/note/test_note.py index 865527b5a0..8d46eaf336 100644 --- a/frappe/desk/doctype/note/test_note.py +++ b/frappe/desk/doctype/note/test_note.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors and Contributors # See license.txt +from __future__ import unicode_literals import frappe import unittest diff --git a/frappe/desk/page/backups/backups.py b/frappe/desk/page/backups/backups.py index 2d493515b7..663ab37cff 100644 --- a/frappe/desk/page/backups/backups.py +++ b/frappe/desk/page/backups/backups.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import os import frappe from frappe import _ diff --git a/frappe/email/doctype/email_account/test_email_account.py b/frappe/email/doctype/email_account/test_email_account.py index bae0229a8c..ca49d50517 100644 --- a/frappe/email/doctype/email_account/test_email_account.py +++ b/frappe/email/doctype/email_account/test_email_account.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # See license.txt +from __future__ import unicode_literals import frappe, os import unittest, email diff --git a/frappe/email/inbox.py b/frappe/email/inbox.py index 5c8d33793a..6cfcf9f263 100644 --- a/frappe/email/inbox.py +++ b/frappe/email/inbox.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe import json diff --git a/frappe/frappeclient.py b/frappe/frappeclient.py index f1f57c2fe4..3c31e05351 100644 --- a/frappe/frappeclient.py +++ b/frappe/frappeclient.py @@ -1,3 +1,4 @@ +from __future__ import print_function, unicode_literals from __future__ import print_function import requests import json diff --git a/frappe/geo/doctype/country/test_country.py b/frappe/geo/doctype/country/test_country.py index 110e38e2b5..81849d6886 100644 --- a/frappe/geo/doctype/country/test_country.py +++ b/frappe/geo/doctype/country/test_country.py @@ -1,6 +1,6 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: See license.txt - +from __future__ import unicode_literals import frappe test_records = frappe.get_test_records('Country') \ No newline at end of file diff --git a/frappe/geo/doctype/currency/test_currency.py b/frappe/geo/doctype/currency/test_currency.py index 5552e675ec..7945e193da 100644 --- a/frappe/geo/doctype/currency/test_currency.py +++ b/frappe/geo/doctype/currency/test_currency.py @@ -3,5 +3,6 @@ # pre loaded +from __future__ import unicode_literals import frappe test_records = frappe.get_test_records('Currency') \ No newline at end of file diff --git a/frappe/integrations/data_migration_mapping/gcalendar_to_event/__init__.py b/frappe/integrations/data_migration_mapping/gcalendar_to_event/__init__.py index 7656173c9b..441d2c3797 100644 --- a/frappe/integrations/data_migration_mapping/gcalendar_to_event/__init__.py +++ b/frappe/integrations/data_migration_mapping/gcalendar_to_event/__init__.py @@ -1,5 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- +from __future__ import unicode_literals import frappe from datetime import datetime from dateutil.parser import parse diff --git a/frappe/integrations/doctype/social_login_keys/social_login_keys.py b/frappe/integrations/doctype/social_login_keys/social_login_keys.py index da9e21cd8e..bd4cea01af 100644 --- a/frappe/integrations/doctype/social_login_keys/social_login_keys.py +++ b/frappe/integrations/doctype/social_login_keys/social_login_keys.py @@ -1,4 +1,5 @@ # see license +from __future__ import unicode_literals from frappe.model.document import Document class SocialLoginKeys(Document): diff --git a/frappe/integrations/doctype/webhook/__init__.py b/frappe/integrations/doctype/webhook/__init__.py index b72acc0578..75af2b360a 100644 --- a/frappe/integrations/doctype/webhook/__init__.py +++ b/frappe/integrations/doctype/webhook/__init__.py @@ -2,6 +2,7 @@ # Copyright (c) 2017, Frappe Technologies and contributors # For license information, please see license.txt +from __future__ import unicode_literals import frappe def run_webhooks(doc, method): @@ -37,7 +38,7 @@ def run_webhooks(doc, method): def _webhook_request(webhook): if not webhook.name in frappe.flags.webhooks_executed.get(doc.name, []): - frappe.enqueue("frappe.integrations.doctype.webhook.webhook.enqueue_webhook", + frappe.enqueue("frappe.integrations.doctype.webhook.webhook.enqueue_webhook", enqueue_after_commit=True, doc=doc, webhook=webhook) # keep list of webhooks executed for this doc in this request diff --git a/frappe/model/dynamic_links.py b/frappe/model/dynamic_links.py index c34dd914ef..6e1ef5037f 100644 --- a/frappe/model/dynamic_links.py +++ b/frappe/model/dynamic_links.py @@ -1,10 +1,11 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # MIT License. See license.txt +from __future__ import unicode_literals import frappe -# select doctypes that are accessed by the user (not read_only) first, so that the -# the validation message shows the user-facing doctype first. +# select doctypes that are accessed by the user (not read_only) first, so that the +# the validation message shows the user-facing doctype first. # For example Journal Entry should be validated before GL Entry (which is an internal doctype) dynamic_link_queries = [ diff --git a/frappe/model/utils/user_settings.py b/frappe/model/utils/user_settings.py index 798c78b919..86f4f7b12f 100644 --- a/frappe/model/utils/user_settings.py +++ b/frappe/model/utils/user_settings.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals # Settings saved per user basis # such as page_limit, filters, last_view diff --git a/frappe/modules/__init__.py b/frappe/modules/__init__.py index 90f60fdd89..fef4829bb6 100644 --- a/frappe/modules/__init__.py +++ b/frappe/modules/__init__.py @@ -1 +1,2 @@ +from __future__ import unicode_literals from .utils import * \ No newline at end of file diff --git a/frappe/oauth.py b/frappe/oauth.py index e89a13cd0e..3eed51b890 100644 --- a/frappe/oauth.py +++ b/frappe/oauth.py @@ -1,3 +1,4 @@ +from __future__ import print_function, unicode_literals from __future__ import print_function import frappe import pytz diff --git a/frappe/patches/v10_0/enable_chat_by_default_within_system_settings.py b/frappe/patches/v10_0/enable_chat_by_default_within_system_settings.py index 09d7b42ce7..eddca78051 100644 --- a/frappe/patches/v10_0/enable_chat_by_default_within_system_settings.py +++ b/frappe/patches/v10_0/enable_chat_by_default_within_system_settings.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v10_0/enhance_security.py b/frappe/patches/v10_0/enhance_security.py index 6a9c371b51..865d18dcff 100644 --- a/frappe/patches/v10_0/enhance_security.py +++ b/frappe/patches/v10_0/enhance_security.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe diff --git a/frappe/patches/v10_0/increase_single_table_column_length.py b/frappe/patches/v10_0/increase_single_table_column_length.py index 3c2a2b3233..18de0cff9e 100644 --- a/frappe/patches/v10_0/increase_single_table_column_length.py +++ b/frappe/patches/v10_0/increase_single_table_column_length.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals """ Run this after updating country_info.json and or """ diff --git a/frappe/patches/v10_0/migrate_passwords_passlib.py b/frappe/patches/v10_0/migrate_passwords_passlib.py index 47a59f4ef5..22b7a86f85 100644 --- a/frappe/patches/v10_0/migrate_passwords_passlib.py +++ b/frappe/patches/v10_0/migrate_passwords_passlib.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.utils.password import LegacyPassword diff --git a/frappe/patches/v10_0/modify_naming_series_table.py b/frappe/patches/v10_0/modify_naming_series_table.py index d98ab1edd1..659e247a38 100644 --- a/frappe/patches/v10_0/modify_naming_series_table.py +++ b/frappe/patches/v10_0/modify_naming_series_table.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals ''' Modify the Integer 10 Digits Value to BigInt 20 Digit value diff --git a/frappe/patches/v10_0/modify_smallest_currency_fraction.py b/frappe/patches/v10_0/modify_smallest_currency_fraction.py index c9ae477359..f875d6b87d 100644 --- a/frappe/patches/v10_0/modify_smallest_currency_fraction.py +++ b/frappe/patches/v10_0/modify_smallest_currency_fraction.py @@ -1,6 +1,7 @@ # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors # MIT License. See license.txt +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v10_0/refactor_social_login_keys.py b/frappe/patches/v10_0/refactor_social_login_keys.py index d896932953..c1a5012cbf 100644 --- a/frappe/patches/v10_0/refactor_social_login_keys.py +++ b/frappe/patches/v10_0/refactor_social_login_keys.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.utils import cstr diff --git a/frappe/patches/v10_0/reload_countries_and_currencies.py b/frappe/patches/v10_0/reload_countries_and_currencies.py index 927fb10a7c..f83ed9c3aa 100644 --- a/frappe/patches/v10_0/reload_countries_and_currencies.py +++ b/frappe/patches/v10_0/reload_countries_and_currencies.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals """ Run this after updating country_info.json and or """ diff --git a/frappe/patches/v10_0/remove_custom_field_for_disabled_domain.py b/frappe/patches/v10_0/remove_custom_field_for_disabled_domain.py index 65e616ea3f..f27639388e 100644 --- a/frappe/patches/v10_0/remove_custom_field_for_disabled_domain.py +++ b/frappe/patches/v10_0/remove_custom_field_for_disabled_domain.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v10_0/set_default_locking_time.py b/frappe/patches/v10_0/set_default_locking_time.py index 045fa0e3fa..1c9797a6cc 100644 --- a/frappe/patches/v10_0/set_default_locking_time.py +++ b/frappe/patches/v10_0/set_default_locking_time.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # MIT License. See license.txt +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v10_0/set_no_copy_to_workflow_state.py b/frappe/patches/v10_0/set_no_copy_to_workflow_state.py index 00ca125bf7..800d4a4d1b 100644 --- a/frappe/patches/v10_0/set_no_copy_to_workflow_state.py +++ b/frappe/patches/v10_0/set_no_copy_to_workflow_state.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v11_0/change_email_signature_fieldtype.py b/frappe/patches/v11_0/change_email_signature_fieldtype.py index ccfa8541c3..f6d4bd5dcb 100644 --- a/frappe/patches/v11_0/change_email_signature_fieldtype.py +++ b/frappe/patches/v11_0/change_email_signature_fieldtype.py @@ -1,6 +1,7 @@ # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors # MIT License. See license.txt +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v11_0/copy_fetch_data_from_options.py b/frappe/patches/v11_0/copy_fetch_data_from_options.py index 4c69a75c55..ae7788450a 100644 --- a/frappe/patches/v11_0/copy_fetch_data_from_options.py +++ b/frappe/patches/v11_0/copy_fetch_data_from_options.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v11_0/delete_all_prepared_reports.py b/frappe/patches/v11_0/delete_all_prepared_reports.py index 2204f90a8d..10bc049895 100644 --- a/frappe/patches/v11_0/delete_all_prepared_reports.py +++ b/frappe/patches/v11_0/delete_all_prepared_reports.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v11_0/delete_duplicate_user_permissions.py b/frappe/patches/v11_0/delete_duplicate_user_permissions.py index 22369fb78e..9795d2dead 100644 --- a/frappe/patches/v11_0/delete_duplicate_user_permissions.py +++ b/frappe/patches/v11_0/delete_duplicate_user_permissions.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v11_0/drop_column_apply_user_permissions.py b/frappe/patches/v11_0/drop_column_apply_user_permissions.py index b1e4ea05f8..ed0a6881af 100644 --- a/frappe/patches/v11_0/drop_column_apply_user_permissions.py +++ b/frappe/patches/v11_0/drop_column_apply_user_permissions.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v11_0/fix_order_by_in_reports_json.py b/frappe/patches/v11_0/fix_order_by_in_reports_json.py index 561efdcee3..2cd82d442d 100644 --- a/frappe/patches/v11_0/fix_order_by_in_reports_json.py +++ b/frappe/patches/v11_0/fix_order_by_in_reports_json.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe, json def execute(): diff --git a/frappe/patches/v11_0/get_docs_apps_if_not_present.py b/frappe/patches/v11_0/get_docs_apps_if_not_present.py index 83f95247bf..e534ebd0b3 100644 --- a/frappe/patches/v11_0/get_docs_apps_if_not_present.py +++ b/frappe/patches/v11_0/get_docs_apps_if_not_present.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.utils.help import setup_apps_for_docs diff --git a/frappe/patches/v11_0/migrate_report_settings_for_new_listview.py b/frappe/patches/v11_0/migrate_report_settings_for_new_listview.py index 9e5ce727c0..5bef52c295 100644 --- a/frappe/patches/v11_0/migrate_report_settings_for_new_listview.py +++ b/frappe/patches/v11_0/migrate_report_settings_for_new_listview.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe, json def execute(): diff --git a/frappe/patches/v11_0/multiple_references_in_events.py b/frappe/patches/v11_0/multiple_references_in_events.py index 86dd36f660..57d4787eca 100644 --- a/frappe/patches/v11_0/multiple_references_in_events.py +++ b/frappe/patches/v11_0/multiple_references_in_events.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v11_0/reload_and_rename_view_log.py b/frappe/patches/v11_0/reload_and_rename_view_log.py index 6d001228fd..611de79a3c 100644 --- a/frappe/patches/v11_0/reload_and_rename_view_log.py +++ b/frappe/patches/v11_0/reload_and_rename_view_log.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v11_0/remove_skip_for_doctype.py b/frappe/patches/v11_0/remove_skip_for_doctype.py index 1849cb7bcd..c3b9ffff80 100644 --- a/frappe/patches/v11_0/remove_skip_for_doctype.py +++ b/frappe/patches/v11_0/remove_skip_for_doctype.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.desk.form.linked_with import get_linked_doctypes from frappe.patches.v11_0.replicate_old_user_permissions import get_doctypes_to_skip diff --git a/frappe/patches/v11_0/rename_email_alert_to_notification.py b/frappe/patches/v11_0/rename_email_alert_to_notification.py index fee6fd2f0d..727055fcc4 100644 --- a/frappe/patches/v11_0/rename_email_alert_to_notification.py +++ b/frappe/patches/v11_0/rename_email_alert_to_notification.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.model.rename_doc import rename_doc diff --git a/frappe/patches/v11_0/rename_google_maps_doctype.py b/frappe/patches/v11_0/rename_google_maps_doctype.py index 1423cd70e4..5420dcfc20 100644 --- a/frappe/patches/v11_0/rename_google_maps_doctype.py +++ b/frappe/patches/v11_0/rename_google_maps_doctype.py @@ -1,7 +1,8 @@ -import frappe -from frappe.model.rename_doc import rename_doc - -def execute(): - if frappe.db.exists("DocType","Google Maps") and not frappe.db.exists("DocType","Google Maps Settings"): - rename_doc('DocType', 'Google Maps', 'Google Maps Settings') +from __future__ import unicode_literals +import frappe +from frappe.model.rename_doc import rename_doc + +def execute(): + if frappe.db.exists("DocType","Google Maps") and not frappe.db.exists("DocType","Google Maps Settings"): + rename_doc('DocType', 'Google Maps', 'Google Maps Settings') frappe.reload_doc('integrations', 'doctype', 'google_maps_settings') \ No newline at end of file diff --git a/frappe/patches/v11_0/rename_standard_reply_to_email_template.py b/frappe/patches/v11_0/rename_standard_reply_to_email_template.py index f5b86b9149..06869530e2 100644 --- a/frappe/patches/v11_0/rename_standard_reply_to_email_template.py +++ b/frappe/patches/v11_0/rename_standard_reply_to_email_template.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.model.rename_doc import rename_doc diff --git a/frappe/patches/v11_0/rename_workflow_action_to_workflow_action_master.py b/frappe/patches/v11_0/rename_workflow_action_to_workflow_action_master.py index ff7bbcb719..32f17ac2d8 100644 --- a/frappe/patches/v11_0/rename_workflow_action_to_workflow_action_master.py +++ b/frappe/patches/v11_0/rename_workflow_action_to_workflow_action_master.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.model.rename_doc import rename_doc diff --git a/frappe/patches/v11_0/replicate_old_user_permissions.py b/frappe/patches/v11_0/replicate_old_user_permissions.py index 63b072502d..d1ceae8a7f 100644 --- a/frappe/patches/v11_0/replicate_old_user_permissions.py +++ b/frappe/patches/v11_0/replicate_old_user_permissions.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe import json from frappe.utils import cint diff --git a/frappe/patches/v11_0/set_allow_self_approval_in_workflow.py b/frappe/patches/v11_0/set_allow_self_approval_in_workflow.py index 99a2b6f536..24c01e1a58 100644 --- a/frappe/patches/v11_0/set_allow_self_approval_in_workflow.py +++ b/frappe/patches/v11_0/set_allow_self_approval_in_workflow.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v11_0/sync_stripe_settings_before_migrate.py b/frappe/patches/v11_0/sync_stripe_settings_before_migrate.py index 211e25fb95..331b0eba32 100644 --- a/frappe/patches/v11_0/sync_stripe_settings_before_migrate.py +++ b/frappe/patches/v11_0/sync_stripe_settings_before_migrate.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.utils.password import get_decrypted_password diff --git a/frappe/patches/v11_0/sync_user_permission_doctype_before_migrate.py b/frappe/patches/v11_0/sync_user_permission_doctype_before_migrate.py index 612d83bf97..738fea1a48 100644 --- a/frappe/patches/v11_0/sync_user_permission_doctype_before_migrate.py +++ b/frappe/patches/v11_0/sync_user_permission_doctype_before_migrate.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v5_0/clear_website_group_and_notifications.py b/frappe/patches/v5_0/clear_website_group_and_notifications.py index 66bd68d5e1..bad50222a3 100644 --- a/frappe/patches/v5_0/clear_website_group_and_notifications.py +++ b/frappe/patches/v5_0/clear_website_group_and_notifications.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v5_0/communication_parent.py b/frappe/patches/v5_0/communication_parent.py index 494c9b218b..2ea3b401c6 100644 --- a/frappe/patches/v5_0/communication_parent.py +++ b/frappe/patches/v5_0/communication_parent.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v5_0/expire_old_scheduler_logs.py b/frappe/patches/v5_0/expire_old_scheduler_logs.py index 2d107d26f6..8b65ed5fb1 100644 --- a/frappe/patches/v5_0/expire_old_scheduler_logs.py +++ b/frappe/patches/v5_0/expire_old_scheduler_logs.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v5_0/modify_session.py b/frappe/patches/v5_0/modify_session.py index 2aaf2da97b..f0e247a633 100644 --- a/frappe/patches/v5_0/modify_session.py +++ b/frappe/patches/v5_0/modify_session.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v5_0/move_scheduler_last_event_to_system_settings.py b/frappe/patches/v5_0/move_scheduler_last_event_to_system_settings.py index 749067612b..0fa1dad1e5 100644 --- a/frappe/patches/v5_0/move_scheduler_last_event_to_system_settings.py +++ b/frappe/patches/v5_0/move_scheduler_last_event_to_system_settings.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v5_0/rename_table_fieldnames.py b/frappe/patches/v5_0/rename_table_fieldnames.py index 79703bbba2..b716599f28 100644 --- a/frappe/patches/v5_0/rename_table_fieldnames.py +++ b/frappe/patches/v5_0/rename_table_fieldnames.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt +from __future__ import unicode_literals import frappe from frappe.model.utils.rename_field import rename_field from frappe.modules import scrub, get_doctype_module diff --git a/frappe/patches/v5_0/update_shared.py b/frappe/patches/v5_0/update_shared.py index 4ba908b334..f2b77895d8 100644 --- a/frappe/patches/v5_0/update_shared.py +++ b/frappe/patches/v5_0/update_shared.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe import frappe.share diff --git a/frappe/patches/v6_0/document_type_rename.py b/frappe/patches/v6_0/document_type_rename.py index 0d9ca7da0e..16c7d34286 100644 --- a/frappe/patches/v6_0/document_type_rename.py +++ b/frappe/patches/v6_0/document_type_rename.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v6_0/fix_ghana_currency.py b/frappe/patches/v6_0/fix_ghana_currency.py index 10365148b1..67f740d240 100644 --- a/frappe/patches/v6_0/fix_ghana_currency.py +++ b/frappe/patches/v6_0/fix_ghana_currency.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals def execute(): from frappe.geo.country_info import get_all diff --git a/frappe/patches/v6_0/make_task_log_folder.py b/frappe/patches/v6_0/make_task_log_folder.py index f557b5c8a1..87d6e4126f 100644 --- a/frappe/patches/v6_0/make_task_log_folder.py +++ b/frappe/patches/v6_0/make_task_log_folder.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe.utils, os def execute(): diff --git a/frappe/patches/v6_1/rename_file_data.py b/frappe/patches/v6_1/rename_file_data.py index 079e16cdcd..83152271eb 100644 --- a/frappe/patches/v6_1/rename_file_data.py +++ b/frappe/patches/v6_1/rename_file_data.py @@ -1,4 +1,4 @@ -from __future__ import print_function +from __future__ import print_function, unicode_literals import frappe def execute(): diff --git a/frappe/patches/v6_11/rename_field_in_email_account.py b/frappe/patches/v6_11/rename_field_in_email_account.py index 8462ab66ad..319b569802 100644 --- a/frappe/patches/v6_11/rename_field_in_email_account.py +++ b/frappe/patches/v6_11/rename_field_in_email_account.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v6_15/set_username.py b/frappe/patches/v6_15/set_username.py index 4e62cad178..513ff3301d 100644 --- a/frappe/patches/v6_15/set_username.py +++ b/frappe/patches/v6_15/set_username.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v6_2/rename_backup_manager.py b/frappe/patches/v6_2/rename_backup_manager.py index 974a4fe7d6..af02e55878 100644 --- a/frappe/patches/v6_2/rename_backup_manager.py +++ b/frappe/patches/v6_2/rename_backup_manager.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v6_20x/remove_roles_from_website_user.py b/frappe/patches/v6_20x/remove_roles_from_website_user.py index 499ad5ddf4..a4d579a1f0 100644 --- a/frappe/patches/v6_20x/remove_roles_from_website_user.py +++ b/frappe/patches/v6_20x/remove_roles_from_website_user.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v6_20x/set_allow_draft_for_print.py b/frappe/patches/v6_20x/set_allow_draft_for_print.py index 3c1008496e..90c15e22b2 100644 --- a/frappe/patches/v6_20x/set_allow_draft_for_print.py +++ b/frappe/patches/v6_20x/set_allow_draft_for_print.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v6_20x/update_insert_after.py b/frappe/patches/v6_20x/update_insert_after.py index b7d5166d0b..5ebec52fc9 100644 --- a/frappe/patches/v6_20x/update_insert_after.py +++ b/frappe/patches/v6_20x/update_insert_after.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe, json def execute(): diff --git a/frappe/patches/v6_24/set_language_as_code.py b/frappe/patches/v6_24/set_language_as_code.py index 0679459783..d685fd7d0e 100644 --- a/frappe/patches/v6_24/set_language_as_code.py +++ b/frappe/patches/v6_24/set_language_as_code.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.translate import get_lang_dict diff --git a/frappe/patches/v6_24/sync_desktop_icons.py b/frappe/patches/v6_24/sync_desktop_icons.py index a635990732..74f52e6056 100644 --- a/frappe/patches/v6_24/sync_desktop_icons.py +++ b/frappe/patches/v6_24/sync_desktop_icons.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe, json from frappe.desk.doctype.desktop_icon.desktop_icon import sync_from_app, get_user_copy diff --git a/frappe/patches/v7_0/add_communication_in_doc.py b/frappe/patches/v7_0/add_communication_in_doc.py index 1ec31be72d..92120634ef 100644 --- a/frappe/patches/v7_0/add_communication_in_doc.py +++ b/frappe/patches/v7_0/add_communication_in_doc.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.core.doctype.communication.comment import update_comment_in_doc diff --git a/frappe/patches/v7_0/cleanup_list_settings.py b/frappe/patches/v7_0/cleanup_list_settings.py index dc918afb79..e03ff57406 100644 --- a/frappe/patches/v7_0/cleanup_list_settings.py +++ b/frappe/patches/v7_0/cleanup_list_settings.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe, json def execute(): diff --git a/frappe/patches/v7_0/create_private_file_folder.py b/frappe/patches/v7_0/create_private_file_folder.py index 51e3d9f07b..bd26917a78 100644 --- a/frappe/patches/v7_0/create_private_file_folder.py +++ b/frappe/patches/v7_0/create_private_file_folder.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe, os def execute(): diff --git a/frappe/patches/v7_0/desktop_icons_hidden_by_admin_as_blocked.py b/frappe/patches/v7_0/desktop_icons_hidden_by_admin_as_blocked.py index 269a8978d4..496af17cd2 100644 --- a/frappe/patches/v7_0/desktop_icons_hidden_by_admin_as_blocked.py +++ b/frappe/patches/v7_0/desktop_icons_hidden_by_admin_as_blocked.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v7_0/re_route.py b/frappe/patches/v7_0/re_route.py index 909838a692..774914bd61 100644 --- a/frappe/patches/v7_0/re_route.py +++ b/frappe/patches/v7_0/re_route.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.model.base_document import get_controller diff --git a/frappe/patches/v7_0/rename_bulk_email_to_email_queue.py b/frappe/patches/v7_0/rename_bulk_email_to_email_queue.py index 7be9aa6a72..9a7a756144 100644 --- a/frappe/patches/v7_0/rename_bulk_email_to_email_queue.py +++ b/frappe/patches/v7_0/rename_bulk_email_to_email_queue.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v7_0/rename_newsletter_list_to_email_group.py b/frappe/patches/v7_0/rename_newsletter_list_to_email_group.py index 059792d68e..79061d383c 100644 --- a/frappe/patches/v7_0/rename_newsletter_list_to_email_group.py +++ b/frappe/patches/v7_0/rename_newsletter_list_to_email_group.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v7_0/set_user_fullname.py b/frappe/patches/v7_0/set_user_fullname.py index f2ddf43b5a..a7c6670f45 100644 --- a/frappe/patches/v7_0/set_user_fullname.py +++ b/frappe/patches/v7_0/set_user_fullname.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v7_0/update_send_after_in_bulk_email.py b/frappe/patches/v7_0/update_send_after_in_bulk_email.py index 157b084255..1b08309b6a 100644 --- a/frappe/patches/v7_0/update_send_after_in_bulk_email.py +++ b/frappe/patches/v7_0/update_send_after_in_bulk_email.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.utils import now_datetime diff --git a/frappe/patches/v7_1/rename_chinese_language_codes.py b/frappe/patches/v7_1/rename_chinese_language_codes.py index 858246faa2..1ed25a4959 100644 --- a/frappe/patches/v7_1/rename_chinese_language_codes.py +++ b/frappe/patches/v7_1/rename_chinese_language_codes.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v7_1/rename_scheduler_log_to_error_log.py b/frappe/patches/v7_1/rename_scheduler_log_to_error_log.py index fdc6b0a44f..4d1a39538f 100644 --- a/frappe/patches/v7_1/rename_scheduler_log_to_error_log.py +++ b/frappe/patches/v7_1/rename_scheduler_log_to_error_log.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v7_1/sync_language_doctype.py b/frappe/patches/v7_1/sync_language_doctype.py index a3eda183b2..83d1a4f5a6 100644 --- a/frappe/patches/v7_1/sync_language_doctype.py +++ b/frappe/patches/v7_1/sync_language_doctype.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.translate import get_lang_dict diff --git a/frappe/patches/v7_2/fix_email_queue_recipient.py b/frappe/patches/v7_2/fix_email_queue_recipient.py index 89aca69c91..645b17b5c9 100644 --- a/frappe/patches/v7_2/fix_email_queue_recipient.py +++ b/frappe/patches/v7_2/fix_email_queue_recipient.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v7_2/merge_knowledge_base.py b/frappe/patches/v7_2/merge_knowledge_base.py index 2eb52acfd6..81ff98230b 100644 --- a/frappe/patches/v7_2/merge_knowledge_base.py +++ b/frappe/patches/v7_2/merge_knowledge_base.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.patches.v7_0.re_route import update_routes diff --git a/frappe/patches/v7_2/remove_in_filter.py b/frappe/patches/v7_2/remove_in_filter.py index dcd62a45e7..36556d7c13 100644 --- a/frappe/patches/v7_2/remove_in_filter.py +++ b/frappe/patches/v7_2/remove_in_filter.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v7_2/set_doctype_engine.py b/frappe/patches/v7_2/set_doctype_engine.py index fa914003f3..3a5cc384a2 100644 --- a/frappe/patches/v7_2/set_doctype_engine.py +++ b/frappe/patches/v7_2/set_doctype_engine.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v7_2/set_in_standard_filter_property.py b/frappe/patches/v7_2/set_in_standard_filter_property.py index b14e0408a8..fc6a75fc53 100644 --- a/frappe/patches/v7_2/set_in_standard_filter_property.py +++ b/frappe/patches/v7_2/set_in_standard_filter_property.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe import pymysql diff --git a/frappe/patches/v7_2/setup_custom_perms.py b/frappe/patches/v7_2/setup_custom_perms.py index f057e7aa0d..1b3b86236c 100644 --- a/frappe/patches/v7_2/setup_custom_perms.py +++ b/frappe/patches/v7_2/setup_custom_perms.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.permissions import setup_custom_perms from frappe.core.page.permission_manager.permission_manager import get_standard_permissions diff --git a/frappe/patches/v7_2/setup_ldap_config.py b/frappe/patches/v7_2/setup_ldap_config.py index 670474dc64..31dd8ca6fe 100644 --- a/frappe/patches/v7_2/setup_ldap_config.py +++ b/frappe/patches/v7_2/setup_ldap_config.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.utils import cint diff --git a/frappe/patches/v7_2/update_communications.py b/frappe/patches/v7_2/update_communications.py index b7a1b962f8..98c729ae41 100644 --- a/frappe/patches/v7_2/update_communications.py +++ b/frappe/patches/v7_2/update_communications.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v7_2/update_feedback_request.py b/frappe/patches/v7_2/update_feedback_request.py index 37e77d9b15..68814e7a58 100644 --- a/frappe/patches/v7_2/update_feedback_request.py +++ b/frappe/patches/v7_2/update_feedback_request.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v8_0/deprecate_integration_broker.py b/frappe/patches/v8_0/deprecate_integration_broker.py index b8201f1ca1..ad1a7d9571 100644 --- a/frappe/patches/v8_0/deprecate_integration_broker.py +++ b/frappe/patches/v8_0/deprecate_integration_broker.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.integrations.utils import create_payment_gateway diff --git a/frappe/patches/v8_0/drop_in_dialog.py b/frappe/patches/v8_0/drop_in_dialog.py index b3ba15764f..231d757f26 100644 --- a/frappe/patches/v8_0/drop_in_dialog.py +++ b/frappe/patches/v8_0/drop_in_dialog.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v8_0/drop_is_custom_from_docperm.py b/frappe/patches/v8_0/drop_is_custom_from_docperm.py index c4e457d813..4530dcd2e0 100644 --- a/frappe/patches/v8_0/drop_is_custom_from_docperm.py +++ b/frappe/patches/v8_0/drop_is_custom_from_docperm.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v8_0/install_new_build_system_requirements.py b/frappe/patches/v8_0/install_new_build_system_requirements.py index 3d8843213a..985f1dbdf2 100644 --- a/frappe/patches/v8_0/install_new_build_system_requirements.py +++ b/frappe/patches/v8_0/install_new_build_system_requirements.py @@ -1,3 +1,4 @@ +from __future__ import print_function, unicode_literals from __future__ import print_function from subprocess import Popen, call, PIPE diff --git a/frappe/patches/v8_0/rename_listsettings_to_usersettings.py b/frappe/patches/v8_0/rename_listsettings_to_usersettings.py index 5f5614a602..961ffe56a1 100644 --- a/frappe/patches/v8_0/rename_listsettings_to_usersettings.py +++ b/frappe/patches/v8_0/rename_listsettings_to_usersettings.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from frappe.installer import create_user_settings_table from frappe.model.utils.user_settings import update_user_settings import frappe, json diff --git a/frappe/patches/v8_0/rename_print_to_printing.py b/frappe/patches/v8_0/rename_print_to_printing.py index 171de9b59b..ecdbc3f7be 100644 --- a/frappe/patches/v8_0/rename_print_to_printing.py +++ b/frappe/patches/v8_0/rename_print_to_printing.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v8_0/set_allow_traceback.py b/frappe/patches/v8_0/set_allow_traceback.py index 2b1e91a7ae..3eceb3e29c 100644 --- a/frappe/patches/v8_0/set_allow_traceback.py +++ b/frappe/patches/v8_0/set_allow_traceback.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v8_0/setup_email_inbox.py b/frappe/patches/v8_0/setup_email_inbox.py index cb4156e935..8cd8b28116 100644 --- a/frappe/patches/v8_0/setup_email_inbox.py +++ b/frappe/patches/v8_0/setup_email_inbox.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe, json from frappe.core.doctype.user.user import ask_pass_update, setup_user_email_inbox diff --git a/frappe/patches/v8_0/update_global_search_table.py b/frappe/patches/v8_0/update_global_search_table.py index cb788da1e0..3c0a70155b 100644 --- a/frappe/patches/v8_0/update_global_search_table.py +++ b/frappe/patches/v8_0/update_global_search_table.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v8_0/update_published_in_global_search.py b/frappe/patches/v8_0/update_published_in_global_search.py index 0a6595319a..a378f24732 100644 --- a/frappe/patches/v8_0/update_published_in_global_search.py +++ b/frappe/patches/v8_0/update_published_in_global_search.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v8_0/update_records_in_global_search.py b/frappe/patches/v8_0/update_records_in_global_search.py index 4792ebec5a..dafa1e76d3 100644 --- a/frappe/patches/v8_0/update_records_in_global_search.py +++ b/frappe/patches/v8_0/update_records_in_global_search.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.utils.global_search import get_doctypes_with_global_search, rebuild_for_doctype from frappe.utils import update_progress_bar diff --git a/frappe/patches/v8_1/delete_custom_docperm_if_doctype_not_exists.py b/frappe/patches/v8_1/delete_custom_docperm_if_doctype_not_exists.py index 6b0b731978..92b54edfd4 100644 --- a/frappe/patches/v8_1/delete_custom_docperm_if_doctype_not_exists.py +++ b/frappe/patches/v8_1/delete_custom_docperm_if_doctype_not_exists.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v8_x/update_user_permission.py b/frappe/patches/v8_x/update_user_permission.py index 0f8045f48d..693b87c974 100644 --- a/frappe/patches/v8_x/update_user_permission.py +++ b/frappe/patches/v8_x/update_user_permission.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v9_1/move_feed_to_activity_log.py b/frappe/patches/v9_1/move_feed_to_activity_log.py index 2d35e1e908..db46b4e419 100644 --- a/frappe/patches/v9_1/move_feed_to_activity_log.py +++ b/frappe/patches/v9_1/move_feed_to_activity_log.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe.utils.background_jobs import enqueue diff --git a/frappe/patches/v9_1/resave_domain_settings.py b/frappe/patches/v9_1/resave_domain_settings.py index 63ad68751d..1e54ad3aa5 100644 --- a/frappe/patches/v9_1/resave_domain_settings.py +++ b/frappe/patches/v9_1/resave_domain_settings.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/patches/v9_1/revert_domain_settings.py b/frappe/patches/v9_1/revert_domain_settings.py index 1682651a51..a14b48dae6 100644 --- a/frappe/patches/v9_1/revert_domain_settings.py +++ b/frappe/patches/v9_1/revert_domain_settings.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe def execute(): diff --git a/frappe/tests/test_patches.py b/frappe/tests/test_patches.py index bdf58df8a1..ed22afc0af 100644 --- a/frappe/tests/test_patches.py +++ b/frappe/tests/test_patches.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import unittest, frappe from frappe.modules import patch_handler diff --git a/frappe/tests/ui/test_test_runner.py b/frappe/tests/ui/test_test_runner.py index 70b9d76b2c..500de336cb 100644 --- a/frappe/tests/ui/test_test_runner.py +++ b/frappe/tests/ui/test_test_runner.py @@ -1,3 +1,4 @@ +from __future__ import print_function, unicode_literals from __future__ import print_function from frappe.utils.selenium_testdriver import TestDriver import unittest, os, frappe, time diff --git a/frappe/tests/ui/test_todo.py b/frappe/tests/ui/test_todo.py index 2d6518f650..3cb5710145 100644 --- a/frappe/tests/ui/test_todo.py +++ b/frappe/tests/ui/test_todo.py @@ -1,3 +1,4 @@ +from __future__ import print_function, unicode_literals from __future__ import print_function from frappe.utils.selenium_testdriver import TestDriver import unittest diff --git a/frappe/utils/html_utils.py b/frappe/utils/html_utils.py index c524cc79c5..e8fc3f86c4 100644 --- a/frappe/utils/html_utils.py +++ b/frappe/utils/html_utils.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe import json, re import bleach, bleach_whitelist.bleach_whitelist as bleach_whitelist diff --git a/frappe/utils/identicon.py b/frappe/utils/identicon.py index 57dec6fbe9..328fb03836 100644 --- a/frappe/utils/identicon.py +++ b/frappe/utils/identicon.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from PIL import Image, ImageDraw from hashlib import md5 import base64 diff --git a/frappe/utils/make_random.py b/frappe/utils/make_random.py index 4b2f7688a5..ad353dea84 100644 --- a/frappe/utils/make_random.py +++ b/frappe/utils/make_random.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe, random from six.moves import range from six import string_types diff --git a/frappe/utils/minify.py b/frappe/utils/minify.py index 303a88900c..08d05c7225 100644 --- a/frappe/utils/minify.py +++ b/frappe/utils/minify.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals # This code is original from jsmin by Douglas Crockford, it was translated to # Python by Baruch Even. The original code had the following copyright and # license. diff --git a/frappe/utils/reset_doc.py b/frappe/utils/reset_doc.py index 3dc91408dd..2119df5897 100755 --- a/frappe/utils/reset_doc.py +++ b/frappe/utils/reset_doc.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe import json, os from frappe.modules import scrub, get_module_path, utils diff --git a/frappe/website/doctype/website_theme/test_website_theme.py b/frappe/website/doctype/website_theme/test_website_theme.py index 6b71a752e1..216a7ae4ce 100644 --- a/frappe/website/doctype/website_theme/test_website_theme.py +++ b/frappe/website/doctype/website_theme/test_website_theme.py @@ -1,6 +1,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # See license.txt +from __future__ import unicode_literals import frappe import unittest diff --git a/frappe/website/purifycss.py b/frappe/website/purifycss.py index d0b68d0c9b..4ba033b10e 100644 --- a/frappe/website/purifycss.py +++ b/frappe/website/purifycss.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals ''' Check for unused CSS Classes diff --git a/frappe/www/feedback.py b/frappe/www/feedback.py index 7eb4c9bb4d..d3ceda8807 100644 --- a/frappe/www/feedback.py +++ b/frappe/www/feedback.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe from frappe import _ from frappe.core.doctype.feedback_request.feedback_request import is_valid_feedback_request diff --git a/frappe/www/robots.py b/frappe/www/robots.py index f56410be5c..07cbcdf531 100644 --- a/frappe/www/robots.py +++ b/frappe/www/robots.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import frappe no_sitemap = 1 diff --git a/setup.py b/setup.py index 935b25178d..c70e138cd2 100644 --- a/setup.py +++ b/setup.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + # imports - standard imports import os, shutil from distutils.command.clean import clean as Clean From 36775a8b62a036df482159cb3fd8e7c7cfbd47f4 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Fri, 25 Jan 2019 11:58:25 +0530 Subject: [PATCH 20/35] fix: Breadcrumbs in File View (#6802) * fix: Breadcrumbs in File View * fix: style and duplication --- .../public/js/frappe/views/file/file_view.js | 105 +++++++++++++----- 1 file changed, 75 insertions(+), 30 deletions(-) diff --git a/frappe/public/js/frappe/views/file/file_view.js b/frappe/public/js/frappe/views/file/file_view.js index 967bda914b..79e360b83e 100644 --- a/frappe/public/js/frappe/views/file/file_view.js +++ b/frappe/public/js/frappe/views/file/file_view.js @@ -8,14 +8,21 @@ frappe.views.FileView = class FileView extends frappe.views.ListView { frappe.set_route('List', 'File', view_user_settings.last_folder || frappe.boot.home_folder); return true; } - return false; + return redirect_to_home_if_invalid_route(); } get view_name() { return 'File'; } + show() { + if (!redirect_to_home_if_invalid_route()) { + super.show(); + } + } + setup_view() { + this.render_header(); this.setup_events(); } @@ -25,11 +32,10 @@ frappe.views.FileView = class FileView extends frappe.views.ListView { const last_folder = route[route.length - 1]; if (last_folder === 'File') return; - const last_folder_route = '#' + route.join('/'); frappe.breadcrumbs.add({ type: 'Custom', - label: last_folder, - route: last_folder_route + label: __('Home'), + route: '#List/File/Home' }); } @@ -132,28 +138,7 @@ frappe.views.FileView = class FileView extends frappe.views.ListView { prepare_data(data) { super.prepare_data(data); - this.data = this.data.map(d => { - let icon_class = ''; - if (d.is_folder) { - icon_class = "octicon octicon-file-directory"; - } else if (frappe.utils.is_image_file(d.file_name)) { - icon_class = "octicon octicon-file-media"; - } else { - icon_class = 'octicon octicon-file-text'; - } - - let title = d.file_name || d.file_url; - title = title.slice(0, 60); - d._title = title; - d.icon_class = icon_class; - - d.subject_html = ` - - ${title} - ${d.is_private ? '' : ''} - `; - return d; - }); + this.data = this.data.map(d => this.prepare_datum(d)); // Bring folders to the top const { sort_by } = this.sort_selector; @@ -170,6 +155,29 @@ frappe.views.FileView = class FileView extends frappe.views.ListView { } } + prepare_datum(d) { + let icon_class = ''; + if (d.is_folder) { + icon_class = "octicon octicon-file-directory"; + } else if (frappe.utils.is_image_file(d.file_name)) { + icon_class = "octicon octicon-file-media"; + } else { + icon_class = 'octicon octicon-file-text'; + } + + let title = d.file_name || d.file_url; + title = title.slice(0, 60); + d._title = title; + d.icon_class = icon_class; + + d.subject_html = ` + + ${title} + ${d.is_private ? '' : ''} + `; + return d; + } + before_render() { super.before_render(); frappe.model.user_settings.save('File', 'grid_view', frappe.views.FileView.grid_view); @@ -206,17 +214,42 @@ frappe.views.FileView = class FileView extends frappe.views.ListView { this.$result.html(html); } + get_breadcrumbs_html() { + const route = frappe.get_route(); + const folders = route.slice(2); + + return folders + .map((folder, i) => { + if (i === folders.length - 1) { + return `${folder}`; + } + const route = folders.reduce((acc, curr, j) => { + if (j <= i) { + acc += '/' + curr; + } + return acc; + }, '#List/File'); + + return `${folder}`; + }) + // only show last 3 breadcrumbs + .slice(-3) + .join(' / '); + } + get_header_html() { + const breadcrumbs_html = this.get_breadcrumbs_html(); + let subject_html = `
- ${__('File Name')} + ${breadcrumbs_html}
`; @@ -228,6 +261,7 @@ frappe.views.FileView = class FileView extends frappe.views.ListView { } get_left_html(file) { + file = this.prepare_datum(file); const file_size = frappe.form.formatters.FileSize(file.file_size); const route_url = this.get_route_url(file); @@ -331,4 +365,15 @@ frappe.views.FileView = class FileView extends frappe.views.ListView { } }; -frappe.views.FileView.grid_view = frappe.get_user_settings('File').grid_view || false; \ No newline at end of file +frappe.views.FileView.grid_view = frappe.get_user_settings('File').grid_view || false; + +function redirect_to_home_if_invalid_route() { + const route = frappe.get_route(); + if (route[2] !== 'Home') { + // if the user somehow redirects to List/File/List + // redirect back to Home + frappe.set_route('List', 'File', 'Home'); + return true; + } + return false; +} From 2a431be19b9074246e768bd021b9b6cda4407c94 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 25 Jan 2019 11:59:13 +0530 Subject: [PATCH 21/35] Set empty string if the value is null or undefined (#6803) --- frappe/public/js/frappe/views/reports/query_report.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index f41c8e565f..a4335c8ce4 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -612,7 +612,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { } const format_cell = (value, row, column, data) => { - return frappe.format(value || '', column, + return frappe.format(value == null ? '' : value, column, {for_print: false, always_show_decimals: true}, data); }; @@ -649,7 +649,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { let row_obj = {}; if (Array.isArray(row)) { this.columns.forEach((column, i) => { - row_obj[column.id] = row[i] || null; + row_obj[column.id] = row[i]; }); return row_obj; From d3b4a165f2d49d82bc64df42e047d7526a4b99c0 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 28 Jan 2019 12:20:24 +0530 Subject: [PATCH 22/35] feat: [v10] Deprecate In App Help (#6834) * [feat] Removed help from global search * [feat] redirected search in help to docs website [] Url needs to be configurable from hooks * [Feat] Removed search functions for help * [fix] Help links not redirecting * [feat] Modified "Help" menu on desk toolbar * [feat] Removed docs search from desk toolbar * Removed Search from toolbar.js * Removed help from migrate * Deprecated help from command utils * Removed help setup from travis.yml * [fix] Fixed formatting issues * [fix] Deleted commented code from toolbar.js * [fix] Minor link fix * [fix] Removed accidentally added autodeploy --- .travis.yml | 2 - frappe/change_log/v8/v8_7_0.md | 2 +- frappe/commands/utils.py | 38 ++++-------------- frappe/migrate.py | 5 --- .../public/js/frappe/ui/toolbar/navbar.html | 8 +--- frappe/public/js/frappe/ui/toolbar/search.js | 25 +----------- .../js/frappe/ui/toolbar/search_utils.js | 40 ------------------- frappe/public/js/frappe/ui/toolbar/toolbar.js | 37 +---------------- 8 files changed, 14 insertions(+), 143 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7c16472271..803d414cd8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,8 +32,6 @@ before_script: - cd ~/frappe-bench - bench use test_site - bench reinstall --yes - - bench setup-help - - bench setup-global-help --mariadb_root_password travis - bench scheduler disable - sed -i 's/9000/9001/g' sites/common_site_config.json - bench start & diff --git a/frappe/change_log/v8/v8_7_0.md b/frappe/change_log/v8/v8_7_0.md index c7b0b4d577..8c982dcbcc 100644 --- a/frappe/change_log/v8/v8_7_0.md +++ b/frappe/change_log/v8/v8_7_0.md @@ -1,2 +1,2 @@ ### User Permissions -- User Permission is now a DocType, a new UX for the existing Role and User Permission managers to make it easy to enter permissions. For more details please check User Permissions \ No newline at end of file +- User Permission is now a DocType, a new UX for the existing Role and User Permission managers to make it easy to enter permissions. For more details please check User Permissions \ No newline at end of file diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py index ff606d940d..774728ca6a 100644 --- a/frappe/commands/utils.py +++ b/frappe/commands/utils.py @@ -455,40 +455,16 @@ def get_version(): @click.command('setup-global-help') @click.option('--mariadb_root_password') def setup_global_help(mariadb_root_password=None): - '''setup help table in a separate database that will be + '''Deprecated: setup help table in a separate database that will be shared by the whole bench and set `global_help_setup` as 1 in common_site_config.json''' - - from frappe.installer import update_site_config - - frappe.local.flags = frappe._dict() - frappe.local.flags.in_setup_help = True - frappe.local.flags.in_install = True - frappe.local.lang = 'en' - frappe.local.conf = frappe.get_site_config(sites_path='.') - - update_site_config('global_help_setup', 1, - site_config_path=os.path.join('.', 'common_site_config.json')) - - if mariadb_root_password: - frappe.local.conf.root_password = mariadb_root_password - - from frappe.utils.help import sync - sync() + print_in_an_help_deprecation() @click.command('setup-help') @pass_context def setup_help(context): - '''Setup help table in the current site (called after migrate)''' - from frappe.utils.help import sync - - for site in context.sites: - try: - frappe.init(site) - frappe.connect() - sync() - finally: - frappe.destroy() + '''Deprecated: Setup help table in the current site (called after migrate)''' + print_in_an_help_deprecation() @click.command('rebuild-global-search') @pass_context @@ -509,6 +485,10 @@ def rebuild_global_search(context): frappe.destroy() +def print_in_an_help_deprecation(): + print("In app help has been deprectated.\nYou can access the documentation on erpnext.com/docs or frappe.io/docs") + return + commands = [ build, clear_cache, @@ -535,7 +515,5 @@ commands = [ watch, _bulk_rename, add_to_email_queue, - setup_global_help, - setup_help, rebuild_global_search ] diff --git a/frappe/migrate.py b/frappe/migrate.py index 8d9ed33b31..6726207add 100644 --- a/frappe/migrate.py +++ b/frappe/migrate.py @@ -14,7 +14,6 @@ from frappe.website import render, router from frappe.desk.doctype.desktop_icon.desktop_icon import sync_desktop_icons from frappe.core.doctype.language.language import sync_languages from frappe.modules.utils import sync_customizations -import frappe.utils.help def migrate(verbose=True, rebuild_website=False): '''Migrate all apps to the latest version, will: @@ -47,10 +46,6 @@ def migrate(verbose=True, rebuild_website=False): frappe.db.commit() - if not frappe.conf.get('global_help_setup'): - # sync help if not set as global - frappe.utils.help.sync() - clear_notifications() frappe.publish_realtime("version-update") diff --git a/frappe/public/js/frappe/ui/toolbar/navbar.html b/frappe/public/js/frappe/ui/toolbar/navbar.html index f702994dcb..cb38a95ea0 100644 --- a/frappe/public/js/frappe/ui/toolbar/navbar.html +++ b/frappe/public/js/frappe/ui/toolbar/navbar.html @@ -53,16 +53,12 @@ style="padding: 50% 7px; font-size: 17px; background-color: #fafbfc; font-weight: 100;">?