Merge branch 'dev' into master

1 files changed, 5 insertions, 5 deletions

diff --git a/modules/realesrgan_model.py b/modules/realesrgan_model.py
index efd7fca5..99983678 100644
--- a/modules/realesrgan_model.py
+++ b/modules/realesrgan_model.py
@@ -17,9 +17,9 @@ class UpscalerRealESRGAN(Upscaler):
         self.user_path = path

         super().__init__()

         try:

-            from basicsr.archs.rrdbnet_arch import RRDBNet

-            from realesrgan import RealESRGANer

-            from realesrgan.archs.srvgg_arch import SRVGGNetCompact

+            from basicsr.archs.rrdbnet_arch import RRDBNet  # noqa: F401

+            from realesrgan import RealESRGANer  # noqa: F401

+            from realesrgan.archs.srvgg_arch import SRVGGNetCompact  # noqa: F401

             self.enable = True

             self.scalers = []

             scalers = self.load_models(path)

@@ -73,7 +73,7 @@ class UpscalerRealESRGAN(Upscaler):
                 return None

 

             if info.local_data_path.startswith("http"):

-                info.local_data_path = load_file_from_url(url=info.data_path, model_dir=self.model_path, progress=True)

+                info.local_data_path = load_file_from_url(url=info.data_path, model_dir=self.model_download_path, progress=True)

 

             return info

         except Exception as e:

@@ -134,6 +134,6 @@ def get_realesrgan_models(scaler):
             ),

         ]

         return models

-    except Exception as e:

+    except Exception:

         print("Error making Real-ESRGAN models list:", file=sys.stderr)

         print(traceback.format_exc(), file=sys.stderr)