rename print_error to report, use it with together with package name

1 files changed, 4 insertions, 3 deletions

diff --git a/modules/safe.py b/modules/safe.py
index b596f565..b1d08a79 100644
--- a/modules/safe.py
+++ b/modules/safe.py
@@ -9,9 +9,10 @@ import _codecs
 import zipfile

 import re

 

-from modules.errors import print_error

 

 # PyTorch 1.13 and later have _TypedStorage renamed to TypedStorage

+from modules import errors

+

 TypedStorage = torch.storage.TypedStorage if hasattr(torch.storage, 'TypedStorage') else torch.storage._TypedStorage

 

 def encode(*args):

@@ -136,7 +137,7 @@ def load_with_extra(filename, extra_handler=None, *args, **kwargs):
             check_pt(filename, extra_handler)

 

     except pickle.UnpicklingError:

-        print_error(

+        errors.report(

             f"Error verifying pickled file from {filename}\n"

             "-----> !!!! The file is most likely corrupted !!!! <-----\n"

             "You can skip this check with --disable-safe-unpickle commandline argument, but that is not going to help you.\n\n",

@@ -144,7 +145,7 @@ def load_with_extra(filename, extra_handler=None, *args, **kwargs):
         )

         return None

     except Exception:

-        print_error(

+        errors.report(

             f"Error verifying pickled file from {filename}\n"

             f"The file may be malicious, so the program is not going to read it.\n"

             f"You can skip this check with --disable-safe-unpickle commandline argument.\n\n",