From 8373c87b755c4937f4e92e934e29a149ed36990a Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 25 Apr 2016 17:54:07 +0530 Subject: [PATCH 1/3] [fix] dropbox backup - encode file path in os.stat --- .../doctype/dropbox_backup/dropbox_backup.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py b/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py index bf9198c73c..6989b811e4 100644 --- a/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +++ b/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 From ab55df65502060b2e4441ff6af275b1bad4da0b7 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 27 Apr 2016 13:14:08 +0530 Subject: [PATCH 2/3] [fix] boot - get_gravatar Fixes #1732 --- frappe/boot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/boot.py b/frappe/boot.py index 8ad75b5bd0..cea9fc09dd 100644 --- a/frappe/boot.py +++ b/frappe/boot.py @@ -123,7 +123,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 From 8d1ace1ccce287535e18abefb7e22a5463fe85e5 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 27 Apr 2016 16:09:44 +0600 Subject: [PATCH 3/3] bumped to version 6.27.15 --- frappe/__version__.py | 2 +- frappe/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/__version__.py b/frappe/__version__.py index 1c1fe380cc..bdb57c573b 100644 --- a/frappe/__version__.py +++ b/frappe/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = "6.27.14" +__version__ = "6.27.15" diff --git a/frappe/hooks.py b/frappe/hooks.py index 4334a618ab..cd8ed6c2d6 100644 --- a/frappe/hooks.py +++ b/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" diff --git a/setup.py b/setup.py index c6fa65db7a..aa4339d1f4 100644 --- a/setup.py +++ b/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(