From 6ea739e4cf83e1a2a6e6a72de0772c0a5502c69b Mon Sep 17 00:00:00 2001 From: Raffael Meyer <14891507+barredterra@users.noreply.github.com> Date: Wed, 23 Aug 2023 07:38:22 +0200 Subject: [PATCH] refactor(File): explicitly import utils (#22143) --- frappe/core/api/file.py | 3 ++- frappe/core/doctype/file/__init__.py | 2 -- frappe/core/doctype/file/file.py | 11 ++++++++++- frappe/email/receive.py | 3 ++- frappe/website/doctype/web_form/web_form.py | 2 +- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/frappe/core/api/file.py b/frappe/core/api/file.py index e3e6a9de08..1a616c3134 100644 --- a/frappe/core/api/file.py +++ b/frappe/core/api/file.py @@ -1,7 +1,8 @@ import json import frappe -from frappe.core.doctype.file.file import File, setup_folder_path +from frappe.core.doctype.file.file import File +from frappe.core.doctype.file.utils import setup_folder_path from frappe.utils import cint, cstr diff --git a/frappe/core/doctype/file/__init__.py b/frappe/core/doctype/file/__init__.py index ad28c17e36..e69de29bb2 100644 --- a/frappe/core/doctype/file/__init__.py +++ b/frappe/core/doctype/file/__init__.py @@ -1,2 +0,0 @@ -from .exceptions import * -from .utils import * diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index 985e5f50ba..6eb175d64d 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -22,7 +22,16 @@ from frappe.utils.file_manager import is_safe_path from frappe.utils.image import optimize_image, strip_exif_data from .exceptions import AttachmentLimitReached, FolderNotEmpty, MaxFileSizeReachedError -from .utils import * +from .utils import ( + decode_file_content, + delete_file, + generate_file_name, + get_content_hash, + get_local_image, + get_web_image, + setup_folder_path, + update_existing_file_docs, +) exclude_from_linked_with = True ImageFile.LOAD_TRUNCATED_IMAGES = True diff --git a/frappe/email/receive.py b/frappe/email/receive.py index 5ddd71a4f6..6af6c3cebe 100644 --- a/frappe/email/receive.py +++ b/frappe/email/receive.py @@ -18,7 +18,8 @@ from email_reply_parser import EmailReplyParser import frappe from frappe import _, safe_decode, safe_encode -from frappe.core.doctype.file import MaxFileSizeReachedError, get_random_filename +from frappe.core.doctype.file.exceptions import MaxFileSizeReachedError +from frappe.core.doctype.file.utils import get_random_filename from frappe.email.oauth import Oauth from frappe.utils import ( add_days, diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py index 9671827457..43a1a6ab1d 100644 --- a/frappe/website/doctype/web_form/web_form.py +++ b/frappe/website/doctype/web_form/web_form.py @@ -7,7 +7,7 @@ import os import frappe from frappe import _, scrub from frappe.core.api.file import get_max_file_size -from frappe.core.doctype.file import remove_file_by_url +from frappe.core.doctype.file.utils import remove_file_by_url from frappe.desk.form.meta import get_code_files_via_hooks from frappe.modules.utils import export_module_json, get_doc_module from frappe.rate_limiter import rate_limit