Merge branch 'dev' into patch-1

1 files changed, 2 insertions, 17 deletions

diff --git a/modules/paths.py b/modules/paths.py
index acf1894b..bada804e 100644
--- a/modules/paths.py
+++ b/modules/paths.py
@@ -1,8 +1,8 @@
 import os

 import sys

-from modules.paths_internal import models_path, script_path, data_path, extensions_dir, extensions_builtin_dir

+from modules.paths_internal import models_path, script_path, data_path, extensions_dir, extensions_builtin_dir  # noqa: F401

 

-import modules.safe

+import modules.safe  # noqa: F401

 

 

 # data_path = cmd_opts_pre.data

@@ -20,7 +20,6 @@ assert sd_path is not None, f"Couldn't find Stable Diffusion in any of: {possibl
 

 path_dirs = [

     (sd_path, 'ldm', 'Stable Diffusion', []),

-    (os.path.join(sd_path, '../taming-transformers'), 'taming', 'Taming Transformers', []),

     (os.path.join(sd_path, '../CodeFormer'), 'inference_codeformer.py', 'CodeFormer', []),

     (os.path.join(sd_path, '../BLIP'), 'models/blip.py', 'BLIP', []),

     (os.path.join(sd_path, '../k-diffusion'), 'k_diffusion/sampling.py', 'k_diffusion', ["atstart"]),

@@ -39,17 +38,3 @@ for d, must_exist, what, options in path_dirs:
         else:

             sys.path.append(d)

         paths[what] = d

-

-

-class Prioritize:

-    def __init__(self, name):

-        self.name = name

-        self.path = None

-

-    def __enter__(self):

-        self.path = sys.path.copy()

-        sys.path = [paths[self.name]] + sys.path

-

-    def __exit__(self, exc_type, exc_val, exc_tb):

-        sys.path = self.path

-        self.path = None