Bladeren bron

Replaced 'except' clause syntax (#3827)

version-14
Aditya Hase 8 jaren geleden
committed by Rushabh Mehta
bovenliggende
commit
ec9a01e3aa
7 gewijzigde bestanden met toevoegingen van 8 en 8 verwijderingen
  1. +1
    -1
      frappe/core/doctype/user_permission/user_permission.py
  2. +1
    -1
      frappe/desk/page/setup_wizard/install_fixtures.py
  3. +1
    -1
      frappe/email/doctype/email_alert/email_alert.py
  4. +2
    -2
      frappe/integrations/doctype/gsuite_settings/gsuite_settings.py
  5. +1
    -1
      frappe/model/utils/link_count.py
  6. +1
    -1
      frappe/modules/utils.py
  7. +1
    -1
      frappe/utils/selenium_testdriver.py

+ 1
- 1
frappe/core/doctype/user_permission/user_permission.py Bestand weergeven

@@ -72,7 +72,7 @@ def get_user_permissions(user=None):
out.setdefault("User", []).append(user)

frappe.cache().hset("user_permissions", user, out)
except frappe.SQLError, e:
except frappe.SQLError as e:
if e.args[0]==1146:
# called from patch
pass


+ 1
- 1
frappe/desk/page/setup_wizard/install_fixtures.py Bestand weergeven

@@ -22,7 +22,7 @@ def update_genders_and_salutations():

try:
doc.insert(ignore_permissions=True)
except frappe.DuplicateEntryError, e:
except frappe.DuplicateEntryError as e:
# pass DuplicateEntryError and continue
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


+ 1
- 1
frappe/email/doctype/email_alert/email_alert.py Bestand weergeven

@@ -242,7 +242,7 @@ def evaluate_alert(doc, alert, event):
alert.send(doc)
except TemplateError:
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.throw(_("Error in Email Alert"))



+ 2
- 2
frappe/integrations/doctype/gsuite_settings/gsuite_settings.py Bestand weergeven

@@ -51,7 +51,7 @@ def gsuite_callback(code=None):
frappe.db.set_value("Gsuite Settings", None, "refresh_token", r['refresh_token'])
frappe.db.commit()
return
except Exception, e:
except Exception as e:
frappe.throw(e.message)

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:
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)

try:


+ 1
- 1
frappe/model/utils/link_count.py Bestand weergeven

@@ -44,7 +44,7 @@ def update_link_count():
try:
frappe.db.sql('update `tab{0}` set idx = idx + {1} where name=%s'.format(key[0], count),
key[1], auto_commit=1)
except Exception, e:
except Exception as e:
if e.args[0]!=1146: # table not found, single
raise e
# reset the count


+ 1
- 1
frappe/modules/utils.py Bestand weergeven

@@ -180,7 +180,7 @@ def load_doctype_module(doctype, module=None, prefix="", suffix=""):
try:
if key not in doctype_python_modules:
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)))

return doctype_python_modules[key]


+ 1
- 1
frappe/utils/selenium_testdriver.py Bestand weergeven

@@ -115,7 +115,7 @@ class TestDriver(object):
elem = self.get_wait(timeout).until(
EC.presence_of_element_located((_by, selector)))
return elem
except Exception, e:
except Exception as e:
# body = self.driver.find_element_by_id('body_div')
# print(body.get_attribute('innerHTML'))
self.print_console()


Laden…
Annuleren
Opslaan