From 2613908ccf06794df2125d82fc24c05a5e2b7f92 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 21 Sep 2016 16:35:34 +0530 Subject: [PATCH 1/3] [patch][fix] create private files folder --- frappe/patches.txt | 2 +- frappe/patches/v7_0/create_private_file_folder.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 frappe/patches/v7_0/create_private_file_folder.py diff --git a/frappe/patches.txt b/frappe/patches.txt index b87ec1465c..e20a130d0f 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -115,7 +115,7 @@ frappe.patches.v6_6.rename_slovak_language frappe.patches.v6_6.fix_file_url frappe.patches.v6_9.rename_burmese_language frappe.patches.v6_11.rename_field_in_email_account -execute:frappe.create_folder(os.path.join(frappe.local.site_path, 'private', 'files')) +frappe.patches.v7_0.create_private_file_folder frappe.patches.v6_15.remove_property_setter_for_previous_field #2015-12-29 frappe.patches.v6_15.set_username execute:frappe.permissions.reset_perms("Error Snapshot") diff --git a/frappe/patches/v7_0/create_private_file_folder.py b/frappe/patches/v7_0/create_private_file_folder.py new file mode 100644 index 0000000000..51e3d9f07b --- /dev/null +++ b/frappe/patches/v7_0/create_private_file_folder.py @@ -0,0 +1,5 @@ +import frappe, os + +def execute(): + if not os.path.exists(os.path.join(frappe.local.site_path, 'private', 'files')): + frappe.create_folder(os.path.join(frappe.local.site_path, 'private', 'files')) \ No newline at end of file From 43b281c29df58dad0e03f01353bda205112262e4 Mon Sep 17 00:00:00 2001 From: Shreyas Patil Date: Fri, 23 Sep 2016 17:16:22 +0530 Subject: [PATCH 2/3] [Fix] Retry on Authentication error by Gmail, if emails are pulled from/pushed to server too frequently (#2090) * [Fix] Authentication error is raised by Gmail, if emails are pulled from/pushed to server too frequently * [Fix] Minor Fix --- frappe/email/smtp.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/frappe/email/smtp.py b/frappe/email/smtp.py index 41c958f3e3..ca9c77e1c1 100644 --- a/frappe/email/smtp.py +++ b/frappe/email/smtp.py @@ -34,16 +34,14 @@ def send(email, append_to=None, retry=1): except smtplib.SMTPRecipientsRefused: frappe.msgprint(_("Invalid recipient address"), title='Email Failed') raise - except smtplib.SMTPServerDisconnected: + except (smtplib.SMTPServerDisconnected, smtplib.SMTPAuthenticationError): if not retry: raise else: retry = retry - 1 _send(retry) - _send(retry) - - + _send(retry) def get_outgoing_email_account(raise_exception_not_set=True, append_to=None): """Returns outgoing email account based on `append_to` or the default @@ -206,4 +204,3 @@ class SMTPServer: except smtplib.SMTPException: frappe.msgprint(_('Unable to send emails at this time')) raise - From edb87a649f8999d1bdd38c4433bb6b4009045e14 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 23 Sep 2016 17:51:33 +0600 Subject: [PATCH 3/3] bumped to version 7.0.35 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index a9126b497f..c4c7da21c8 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template -__version__ = "7.0.34" +__version__ = "7.0.35" local = Local()