@@ -72,7 +72,7 @@ def get_user_permissions(user=None): | |||||
out.setdefault("User", []).append(user) | out.setdefault("User", []).append(user) | ||||
frappe.cache().hset("user_permissions", user, out) | frappe.cache().hset("user_permissions", user, out) | ||||
except frappe.SQLError, e: | |||||
except frappe.SQLError as e: | |||||
if e.args[0]==1146: | if e.args[0]==1146: | ||||
# called from patch | # called from patch | ||||
pass | pass | ||||
@@ -22,7 +22,7 @@ def update_genders_and_salutations(): | |||||
try: | try: | ||||
doc.insert(ignore_permissions=True) | doc.insert(ignore_permissions=True) | ||||
except frappe.DuplicateEntryError, e: | |||||
except frappe.DuplicateEntryError as e: | |||||
# pass DuplicateEntryError and continue | # pass DuplicateEntryError and continue | ||||
if e.args and e.args[0]==doc.doctype and e.args[1]==doc.name: | if e.args and e.args[0]==doc.doctype and e.args[1]==doc.name: | ||||
# make sure DuplicateEntryError is for the exact same doc and not a related doc | # make sure DuplicateEntryError is for the exact same doc and not a related doc | ||||
@@ -242,7 +242,7 @@ def evaluate_alert(doc, alert, event): | |||||
alert.send(doc) | alert.send(doc) | ||||
except TemplateError: | except TemplateError: | ||||
frappe.throw(_("Error while evaluating Email Alert {0}. Please fix your template.").format(alert)) | frappe.throw(_("Error while evaluating Email Alert {0}. Please fix your template.").format(alert)) | ||||
except Exception, e: | |||||
except Exception as e: | |||||
frappe.log_error(message=frappe.get_traceback(), title=e) | frappe.log_error(message=frappe.get_traceback(), title=e) | ||||
frappe.throw(_("Error in Email Alert")) | frappe.throw(_("Error in Email Alert")) | ||||
@@ -51,7 +51,7 @@ def gsuite_callback(code=None): | |||||
frappe.db.set_value("Gsuite Settings", None, "refresh_token", r['refresh_token']) | frappe.db.set_value("Gsuite Settings", None, "refresh_token", r['refresh_token']) | ||||
frappe.db.commit() | frappe.db.commit() | ||||
return | return | ||||
except Exception, e: | |||||
except Exception as e: | |||||
frappe.throw(e.message) | frappe.throw(e.message) | ||||
def run_gsuite_script(option, filename = None, template_id = None, destination_id = None, json_data = None): | def run_gsuite_script(option, filename = None, template_id = None, destination_id = None, json_data = None): | ||||
@@ -68,7 +68,7 @@ def run_gsuite_script(option, filename = None, template_id = None, destination_i | |||||
try: | try: | ||||
r = requests.post(gdoc.script_url, headers=headers, data=dumps(data, default=json_handler, separators=(',',':'))) | r = requests.post(gdoc.script_url, headers=headers, data=dumps(data, default=json_handler, separators=(',',':'))) | ||||
except Exception, e: | |||||
except Exception as e: | |||||
frappe.throw(e.message) | frappe.throw(e.message) | ||||
try: | try: | ||||
@@ -44,7 +44,7 @@ def update_link_count(): | |||||
try: | try: | ||||
frappe.db.sql('update `tab{0}` set idx = idx + {1} where name=%s'.format(key[0], count), | frappe.db.sql('update `tab{0}` set idx = idx + {1} where name=%s'.format(key[0], count), | ||||
key[1], auto_commit=1) | key[1], auto_commit=1) | ||||
except Exception, e: | |||||
except Exception as e: | |||||
if e.args[0]!=1146: # table not found, single | if e.args[0]!=1146: # table not found, single | ||||
raise e | raise e | ||||
# reset the count | # reset the count | ||||
@@ -180,7 +180,7 @@ def load_doctype_module(doctype, module=None, prefix="", suffix=""): | |||||
try: | try: | ||||
if key not in doctype_python_modules: | if key not in doctype_python_modules: | ||||
doctype_python_modules[key] = frappe.get_module(module_name) | doctype_python_modules[key] = frappe.get_module(module_name) | ||||
except ImportError, e: | |||||
except ImportError as e: | |||||
raise ImportError('Module import failed for {0} ({1})'.format(doctype, module_name + ' Error: ' + str(e))) | raise ImportError('Module import failed for {0} ({1})'.format(doctype, module_name + ' Error: ' + str(e))) | ||||
return doctype_python_modules[key] | return doctype_python_modules[key] | ||||
@@ -115,7 +115,7 @@ class TestDriver(object): | |||||
elem = self.get_wait(timeout).until( | elem = self.get_wait(timeout).until( | ||||
EC.presence_of_element_located((_by, selector))) | EC.presence_of_element_located((_by, selector))) | ||||
return elem | return elem | ||||
except Exception, e: | |||||
except Exception as e: | |||||
# body = self.driver.find_element_by_id('body_div') | # body = self.driver.find_element_by_id('body_div') | ||||
# print(body.get_attribute('innerHTML')) | # print(body.get_attribute('innerHTML')) | ||||
self.print_console() | self.print_console() | ||||