Merge branch 'develop'

frappe/__version__.py

@@ -1 +1,2 @@
-__version__ = "4.12.1"
+from __future__ import unicode_literals
+__version__ = "4.12.2"

frappe/api.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # MIT License. See license.txt
+from __future__ import unicode_literals
 
 import json
 import frappe

frappe/app.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # MIT License. See license.txt
+from __future__ import unicode_literals
 
 import sys, os
 import json

frappe/config/desktop.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from frappe import _
 
 def get_data():

frappe/config/setup.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from frappe import _
 from frappe.widgets.moduleview import add_setup_section
 

frappe/config/website.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from frappe import _
 
 def get_data():

frappe/core/doctype/communication/communication.py

@@ -4,13 +4,12 @@
 from __future__ import unicode_literals
 import frappe
 import json
-import urllib
 from email.utils import formataddr
 from frappe.website.utils import is_signup_enabled
 from frappe.utils import get_url, cstr
 from frappe.utils.email_lib.email_body import get_email
 from frappe.utils.email_lib.smtp import send
-from frappe.utils import scrub_urls, cint
+from frappe.utils import scrub_urls, cint, quoted
 from frappe import _
 
 from frappe.model.document import Document
@@ -167,14 +166,13 @@ def attach_print(mail, sent_via, print_html, print_format):
 
 def set_portal_link(sent_via, comm):
 	"""set portal link in footer"""
-
 	footer = ""
 
 	if is_signup_enabled():
 		is_valid_recipient = cstr(sent_via.get("email") or sent_via.get("email_id") or
 			sent_via.get("contact_email")) in comm.recipients
 		if is_valid_recipient:
-			url = "%s/%s/%s" % (get_url(), urllib.quote(sent_via.doctype), urllib.quote(sent_via.name))
+			url = quoted("%s/%s/%s" % (get_url(), sent_via.doctype, sent_via.name))
 			footer = """<!-- Portal Link -->
 					<p><a href="%s" target="_blank">View this on our website</a></p>""" % url
 

frappe/core/doctype/communication/test_communication.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest

frappe/core/doctype/doctype/boilerplate/test_controller.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, {app_publisher} and Contributors
 # See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest

frappe/core/doctype/email_alert/test_email_alert.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # See license.txt
+from __future__ import unicode_literals
 
 import frappe, frappe.utils, frappe.utils.scheduler
 import unittest

frappe/core/doctype/event/test_event.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # MIT License. See license.txt
+from __future__ import unicode_literals
 
 """Use blog post test to test user permissions logic"""
 

frappe/core/doctype/letter_head/test_letter_head.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # MIT License. See license.txt
+from __future__ import unicode_literals
 
 import frappe
 

frappe/core/doctype/page/test_page.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest

frappe/core/doctype/print_format/test_print_format.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest

frappe/core/doctype/role/test_role.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # MIT License. See license.txt
+from __future__ import unicode_literals
 
 import frappe
 

frappe/core/doctype/user/test_user.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # MIT License. See license.txt
+from __future__ import unicode_literals
 
 import frappe, unittest
 

frappe/core/doctype/version/test_version.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest

frappe/core/doctype/workflow_state/test_workflow_state.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # MIT License. See license.txt
+from __future__ import unicode_literals
 
 import frappe
 

frappe/core/page/data_import_tool/test_exporter_fixtures.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # MIT License. See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import frappe.defaults

frappe/core/page/desktop/desktop.js

@@ -139,7 +139,7 @@ frappe.desktop.show_all_modules = function() {
 				module.label = __(module.label);
 				$(repl('<div class="list-group-item" data-label="%(name)s">\
 				<div class="row">\
-					<div class="col-xs-2"><a href="#%(link)s">%(app_icon)s</a></div>\
+					<div class="col-xs-2">%(app_icon)s</div>\
 					<div class="col-xs-10" style="padding-top: 14px;">\
 						%(label)s\
 						<input class="pull-right" type="checkbox" data-name="%(name)s" />\

frappe/hooks.py

@@ -1,9 +1,10 @@
+from __future__ import unicode_literals
 app_name = "frappe"
 app_title = "Frappe Framework"
 app_publisher = "Web Notes Technologies Pvt. Ltd."
 app_description = "Full Stack Web Application Framework in Python"
 app_icon = "assets/frappe/images/frappe.svg"
-app_version = "4.12.1"
+app_version = "4.12.2"
 app_color = "#3498db"
 app_email = "support@frappe.io"
 

frappe/model/db_schema.py

@@ -24,7 +24,7 @@ type_map = {
 	,'Small Text':	('text', '')
 	,'Long Text':	('longtext', '')
 	,'Code':		('text', '')
-	,'Text Editor':	('text', '')
+	,'Text Editor':	('longtext', '')
 	,'Date':		('date', '')
 	,'Datetime':	('datetime', '6')
 	,'Time':		('time', '6')

frappe/patches/v4_0/add_delete_permission.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe
 
 def execute():

frappe/patches/v4_0/remove_index_sitemap.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe
 
 def execute():

frappe/patches/v4_0/rename_profile_to_user.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe
 
 from frappe.model import rename_field

frappe/patches/v4_0/rename_sitemap_to_route.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe
 
 from frappe.model import rename_field

frappe/patches/v4_0/set_todo_checked_as_closed.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe
 
 def execute():

frappe/patches/v4_0/set_website_route_idx.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe
 
 def execute():

frappe/patches/v4_0/update_datetime.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe
 
 def execute():

frappe/patches/v4_0/webnotes_to_frappe.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe, json
 
 def execute():

frappe/patches/v4_2/refactor_website_routing.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe
 
 def execute():

frappe/patches/v4_2/set_assign_in_doc.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe
 
 def execute():

frappe/public/js/frappe/model/perm.js

@@ -105,6 +105,12 @@ $.extend(frappe.perm, {
 				delete perm[0][key];
 			}
 		});
+
+		$.each(perm, function(i, v) {
+			if(v===undefined) {
+				perm[i] = {};
+			}
+		});
 	},
 
 	get_match_rules: function(doctype, ptype) {

frappe/setup_logging.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe
 import logging
 import logging.config

frappe/templates/includes/comments.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # MIT License. See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import frappe.utils, markdown2

frappe/templates/pages/404.py

@@ -1,4 +1,5 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # MIT License. See license.txt
+from __future__ import unicode_literals
 
 no_sitemap = 1

frappe/templates/pages/update_password.py

@@ -1,4 +1,5 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # MIT License. See license.txt 
+from __future__ import unicode_literals
 
 no_sitemap = 1

frappe/tests/test_assign.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2014, Web Notes Technologies Pvt. Ltd. and Contributors
 # MIT License. See license.txt
+from __future__ import unicode_literals
 
 import frappe, unittest
 import frappe.widgets.form.assign_to

frappe/tests/test_client_login.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # MIT License. See license.txt
+from __future__ import unicode_literals
 
 import unittest, frappe
 from frappe.utils import sel

frappe/tests/test_data_import.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2014, Web Notes Technologies Pvt. Ltd. and Contributors
 # MIT License. See license.txt
+from __future__ import unicode_literals
 
 import frappe, unittest
 from frappe.core.page.data_import_tool import exporter

frappe/tests/test_db_query.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # MIT License. See license.txt
+from __future__ import unicode_literals
 
 import frappe, unittest
 

frappe/tests/test_defaults.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # MIT License. See license.txt
+from __future__ import unicode_literals
 
 import frappe, unittest
 

frappe/tests/test_document.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # MIT License. See license.txt
+from __future__ import unicode_literals
 
 import frappe, unittest
 

frappe/tests/test_filemanager.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # MIT License. See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import os

frappe/tests/test_fmt_money.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # MIT License. See license.txt
+from __future__ import unicode_literals
 
 import frappe
 from frappe import _

frappe/tests/test_form_load.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # MIT License. See license.txt
+from __future__ import unicode_literals
 
 import frappe, unittest
 from frappe.widgets.form.meta import get_meta

frappe/tests/test_geo_ip.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # MIT License. See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest

frappe/tests/test_translation.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # MIT License. See license.txt
+from __future__ import unicode_literals
 
 import frappe, unittest, os
 import frappe.translate

frappe/utils/bench_helper.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import click
 import frappe
 import importlib

frappe/utils/data.py

@@ -583,10 +583,13 @@ def expand_relative_urls(html):
 
 	return re.sub('(href|src){1}([\s]*=[\s]*[\'"]?)((?!http)[^\'" >]+)([\'"]?)', _expand_relative_urls, html)
 
+def quoted(url):
+	return cstr(urllib.quote(encode(url), safe=b"~@#$&()*!+=:;,.?/'"))
+
 def quote_urls(html):
 	def _quote_url(match):
 		groups = list(match.groups())
-		groups[2] = urllib.quote(groups[2].encode("utf-8"), safe=b"~@#$&()*!+=:;,.?/'").decode("utf-8")
+		groups[2] = quoted(groups[2])
 		return "".join(groups)
 	return re.sub('(href|src){1}([\s]*=[\s]*[\'"]?)((?:http)[^\'">]+)([\'"]?)',
 		_quote_url, html)

frappe/utils/doctor.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import json, base64, os
 import frappe.cli
 from frappe.celery_app import get_celery

frappe/utils/email_lib/html2text.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 """html2text: Turn HTML into equivalent Markdown-structured text."""
+from __future__ import unicode_literals
 __version__ = "3.200.3"
 __author__ = "Aaron Swartz (me@aaronsw.com)"
 __copyright__ = "(C) 2004-2008 Aaron Swartz. GNU GPL 3."

frappe/utils/minify.py

@@ -208,4 +208,4 @@ class JavascriptMinify(object):
 		self.theLookahead = None
 
 		self._jsmin()
-		self.instream.close()
+		self.instream.close()

frappe/utils/momentjs.py

@@ -1,4 +1,5 @@
 # get data for moment.js
+from __future__ import unicode_literals
 def update(tz, out):
 	ltz = data["links"].get(tz, tz)
 	zone = data["zones"].get(ltz)

frappe/utils/pdf.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # MIT License. See license.txt
+from __future__ import unicode_literals
 
 import pdfkit, os, frappe
 from frappe.utils import scrub_urls

frappe/website/doctype/blog_category/test_blog_category.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # MIT License. See license.txt
+from __future__ import unicode_literals
 
 import frappe
 

frappe/website/doctype/blog_post/test_blog_post.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # MIT License. See license.txt
+from __future__ import unicode_literals
 
 """Use blog post test to test user permissions logic"""
 

frappe/website/doctype/blogger/test_blogger.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # MIT License. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

frappe/website/doctype/web_form/test_web_form.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest

frappe/website/doctype/website_group/test_website_group.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = "4.12.1"
+version = "4.12.2"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()