From 702e52e66547d718b126dd07d8b65deba2191139 Mon Sep 17 00:00:00 2001 From: tundebabzy Date: Mon, 19 Jun 2017 04:37:19 +0100 Subject: [PATCH] Change raise syntax to python 3 compatible style (#3497) * python 3 compatible raise statement * python 3 compatible raise statement * python 3 compatible raise statement * python 3 compatible raise statement * python 3 compatible raise statement * python 3 compatible raise statement * python 3 compatible raise statement * python 3 compatible raise statement * python 3 compatible raise statement * python 3 compatible raise statement * python 3 compatible raise statement * python 3 compatible raise statement --- frappe/__init__.py | 4 ++-- frappe/commands/site.py | 2 +- frappe/defaults.py | 2 +- frappe/desk/desk_page.py | 4 ++-- frappe/desk/form/load.py | 4 ++-- frappe/desk/query_builder.py | 4 ++-- frappe/email/smtp.py | 4 ++-- frappe/model/naming.py | 2 +- frappe/modules/import_file.py | 2 +- frappe/modules/utils.py | 4 ++-- frappe/patches/v4_0/private_backups.py | 2 +- frappe/utils/response.py | 4 ++-- frappe/utils/sel.py | 2 +- frappe/website/doctype/blog_post/blog_post.py | 2 +- frappe/website/doctype/web_form/web_form.py | 2 +- 15 files changed, 22 insertions(+), 22 deletions(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index abfa10305e..f1b1bbbdf2 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -277,9 +277,9 @@ def msgprint(msg, title=None, raise_exception=0, as_table=False, indicator=None, import inspect if inspect.isclass(raise_exception) and issubclass(raise_exception, Exception): - raise raise_exception, encode(msg) + raise raise_exception(encode(msg)) else: - raise ValidationError, encode(msg) + raise ValidationError(encode(msg)) if flags.mute_messages: _raise_exception() diff --git a/frappe/commands/site.py b/frappe/commands/site.py index 35f54203d1..5773278835 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -376,7 +376,7 @@ def _drop_site(site, root_login='root', root_password=None, archived_sites_path= def move(dest_dir, site): if not os.path.isdir(dest_dir): - raise Exception, "destination is not a directory or does not exist" + raise Exception("destination is not a directory or does not exist") frappe.init(site) old_path = frappe.utils.get_site_path() diff --git a/frappe/defaults.py b/frappe/defaults.py index aeba2f4d28..b4c7ff6452 100644 --- a/frappe/defaults.py +++ b/frappe/defaults.py @@ -163,7 +163,7 @@ def clear_default(key=None, value=None, parent=None, name=None, parenttype=None) clear_cache("__global") if not conditions: - raise Exception, "[clear_default] No key specified." + raise Exception("[clear_default] No key specified.") frappe.db.sql("""delete from tabDefaultValue where {0}""".format(" and ".join(conditions)), tuple(values)) diff --git a/frappe/desk/desk_page.py b/frappe/desk/desk_page.py index fc7281e06c..6c5fdc6821 100644 --- a/frappe/desk/desk_page.py +++ b/frappe/desk/desk_page.py @@ -20,8 +20,8 @@ def get(name): return docs else: frappe.response['403'] = 1 - raise frappe.PermissionError, 'No read permission for Page %s' % \ - (page.title or name) + raise frappe.PermissionError('No read permission for Page %s' %(page.title or name)) + @frappe.whitelist(allow_guest=True) def getpage(): diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py index 450088936a..87e48b0450 100644 --- a/frappe/desk/form/load.py +++ b/frappe/desk/form/load.py @@ -20,7 +20,7 @@ def getdoc(doctype, name, user=None): """ if not (doctype and name): - raise Exception, 'doctype and name required!' + raise Exception('doctype and name required!') if not name: name = doctype @@ -34,7 +34,7 @@ def getdoc(doctype, name, user=None): if not doc.has_permission("read"): frappe.flags.error_message = _('Insufficient Permission for {0}').format(frappe.bold(doctype + ' ' + name)) - raise frappe.PermissionError, ("read", doctype, name) + raise frappe.PermissionError(("read", doctype, name)) doc.apply_fieldlevel_read_permissions() diff --git a/frappe/desk/query_builder.py b/frappe/desk/query_builder.py index 43e1b21715..4e23318d07 100644 --- a/frappe/desk/query_builder.py +++ b/frappe/desk/query_builder.py @@ -158,7 +158,7 @@ def runquery(q='', ret=0, from_export=0): if frappe.form_dict.get('simple_query') or frappe.form_dict.get('is_simple'): if not q: q = frappe.form_dict.get('simple_query') or frappe.form_dict.get('query') if q.split()[0].lower() != 'select': - raise Exception, 'Query must be a SELECT' + raise Exception('Query must be a SELECT') as_dict = cint(frappe.form_dict.get('as_dict')) res = frappe.db.sql(q, as_dict = as_dict, as_list = not as_dict, formatted=formatted) @@ -209,7 +209,7 @@ def runquery(q='', ret=0, from_export=0): qm = frappe.form_dict.get('query_max') or '' if qm and qm.strip(): if qm.split()[0].lower() != 'select': - raise Exception, 'Query (Max) must be a SELECT' + raise Exception('Query (Max) must be a SELECT') if not frappe.form_dict.get('simple_query'): qm = add_match_conditions(qm, tl) diff --git a/frappe/email/smtp.py b/frappe/email/smtp.py index 1803dfb730..20a4a670a6 100644 --- a/frappe/email/smtp.py +++ b/frappe/email/smtp.py @@ -157,7 +157,7 @@ class SMTPServer: if not getattr(self, 'server'): err_msg = _('Email Account not setup. Please create a new Email Account from Setup > Email > Email Account') frappe.msgprint(err_msg) - raise frappe.OutgoingEmailError, err_msg + raise frappe.OutgoingEmailError(err_msg) try: if self.use_tls and not self.port: @@ -169,7 +169,7 @@ class SMTPServer: if not self._sess: err_msg = _('Could not connect to outgoing email server') frappe.msgprint(err_msg) - raise frappe.OutgoingEmailError, err_msg + raise frappe.OutgoingEmailError(err_msg) if self.use_tls: self._sess.ehlo() diff --git a/frappe/model/naming.py b/frappe/model/naming.py index dbe236f09e..ef431adfda 100644 --- a/frappe/model/naming.py +++ b/frappe/model/naming.py @@ -43,7 +43,7 @@ def set_new_name(doc): doc.name = (doc.get(fieldname) or "").strip() if not doc.name: frappe.throw(_("{0} is required").format(doc.meta.get_label(fieldname))) - raise Exception, 'Name is required' + raise Exception('Name is required') if autoname.startswith("naming_series:"): set_name_by_naming_series(doc) elif "#" in autoname: diff --git a/frappe/modules/import_file.py b/frappe/modules/import_file.py index bbadac65e8..5f7c04c7f5 100644 --- a/frappe/modules/import_file.py +++ b/frappe/modules/import_file.py @@ -80,7 +80,7 @@ def read_doc_from_file(path): print("bad json: {0}".format(path)) raise else: - raise IOError, '%s missing' % path + raise IOError('%s missing' % path) return doc diff --git a/frappe/modules/utils.py b/frappe/modules/utils.py index e5f1bac707..293c371075 100644 --- a/frappe/modules/utils.py +++ b/frappe/modules/utils.py @@ -43,7 +43,7 @@ def export_customizations(module, doctype, sync_on_migrate=0, with_permissions=0 """Export Custom Field and Property Setter for the current document to the app folder. This will be synced with bench migrate""" if not frappe.get_conf().developer_mode: - raise 'Not developer mode' + raise Exception('Not developer mode') custom = {'custom_fields': [], 'property_setters': [], 'custom_perms': [], 'doctype': doctype, 'sync_on_migrate': 1} @@ -181,7 +181,7 @@ def load_doctype_module(doctype, module=None, prefix="", suffix=""): if key not in doctype_python_modules: doctype_python_modules[key] = frappe.get_module(module_name) except ImportError: - raise ImportError, 'Module import failed for {0} ({1})'.format(doctype, module_name) + raise ImportError('Module import failed for {0} ({1})'.format(doctype, module_name)) return doctype_python_modules[key] diff --git a/frappe/patches/v4_0/private_backups.py b/frappe/patches/v4_0/private_backups.py index a21da76dd1..016af0615d 100644 --- a/frappe/patches/v4_0/private_backups.py +++ b/frappe/patches/v4_0/private_backups.py @@ -8,4 +8,4 @@ from frappe.installer import make_site_dirs def execute(): make_site_dirs() if frappe.local.conf.backup_path and frappe.local.conf.backup_path.startswith("public"): - raise Exception, "Backups path in conf set to public directory" + raise Exception("Backups path in conf set to public directory") diff --git a/frappe/utils/response.py b/frappe/utils/response.py index 66a66a579b..b94a28b099 100644 --- a/frappe/utils/response.py +++ b/frappe/utils/response.py @@ -117,8 +117,8 @@ def json_handler(obj): return repr(obj) else: - raise TypeError, """Object of type %s with value of %s is not JSON serializable""" % \ - (type(obj), repr(obj)) + raise TypeError("""Object of type %s with value of %s is not JSON serializable""" % \ + (type(obj), repr(obj))) def as_page(): """print web page""" diff --git a/frappe/utils/sel.py b/frappe/utils/sel.py index 21441beddc..8c7856fd41 100644 --- a/frappe/utils/sel.py +++ b/frappe/utils/sel.py @@ -78,7 +78,7 @@ def go_to_module(module_name, item=None): page = "List/" + module_name m = find('#page-desktop [data-link="{0}"] .app-icon'.format(page)) if not m: - raise Exception, "Module {0} not found".format(module_name) + raise Exception("Module {0} not found".format(module_name)) m[0].click() wait_for_page(page) diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py index ed6298f998..29f62098b5 100644 --- a/frappe/website/doctype/blog_post/blog_post.py +++ b/frappe/website/doctype/blog_post/blog_post.py @@ -47,7 +47,7 @@ class BlogPost(WebsiteGenerator): def get_context(self, context): # this is for double precaution. usually it wont reach this code if not published if not cint(self.published): - raise Exception, "This blog has not been published yet!" + raise Exception("This blog has not been published yet!") # temp fields context.full_name = get_fullname(self.owner) diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py index b6b0929bfb..8c122a6132 100644 --- a/frappe/website/doctype/web_form/web_form.py +++ b/frappe/website/doctype/web_form/web_form.py @@ -436,7 +436,7 @@ def delete(web_form, name): if frappe.session.user == owner and web_form.allow_delete: frappe.delete_doc(web_form.doc_type, name, ignore_permissions=True) else: - raise frappe.PermissionError, "Not Allowed" + raise frappe.PermissionError("Not Allowed") def has_web_form_permission(doctype, name, ptype='read'): if frappe.session.user=="Guest":