Merge branch 'master' into develop

frappe/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = "6.27.14"
+__version__ = "6.27.15"

frappe/boot.py

@@ -120,7 +120,7 @@ def get_fullnames():
 	d = {}
 	for r in ret:
 		# if not r.image:
-		# 	r.image = get_gravatar()
+		# 	r.image = get_gravatar(r.name)
 		d[r.name] = r
 
 	return d

frappe/hooks.py

@@ -5,7 +5,7 @@ app_publisher = "Frappe Technologies"
 app_description = "Full stack web framework with Python, Javascript, MariaDB, Redis, Node"
 
 app_icon = "octicon octicon-circuit-board"
-app_version = "6.27.14"
+app_version = "6.27.15"
 app_color = "orange"
 source_link = "https://github.com/frappe/frappe"
 app_license = "MIT"

frappe/integrations/doctype/dropbox_backup/dropbox_backup.py

@@ -14,9 +14,9 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document
-from frappe.utils import cint, split_emails, get_request_site_address, cstr
+from frappe.utils import (cint, split_emails, get_request_site_address, cstr,
+	get_files_path, get_backups_path, encode)
 from frappe.utils.backups import new_backup
-from frappe.utils import get_files_path, get_backups_path
 
 import os
 from frappe import _
@@ -197,7 +197,8 @@ def upload_from_folder(path, dropbox_folder, dropbox_client, did_not_upload, err
 		found = False
 		filepath = os.path.join(path, filename)
 		for file_metadata in response["contents"]:
- 			if os.path.basename(filepath) == os.path.basename(file_metadata["path"]) and os.stat(filepath).st_size == int(file_metadata["bytes"]):
+ 			if (os.path.basename(filepath) == os.path.basename(file_metadata["path"])
+				and os.stat(encode(filepath)).st_size == int(file_metadata["bytes"])):
 				found = True
 				break
 
@@ -224,7 +225,7 @@ def get_dropbox_session():
 
 def upload_file_to_dropbox(filename, folder, dropbox_client):
 	from dropbox import rest
-	size = os.stat(filename).st_size
+	size = os.stat(encode(filename)).st_size
 
 	with open(filename, 'r') as f:
 		# if max packet size reached, use chunked uploader

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 from pip.req import parse_requirements
 
-version = "6.27.14"
+version = "6.27.15"
 requirements = parse_requirements("requirements.txt", session="")
 
 setup(