Merge branch 'master' into remove-watermark-option

1 files changed, 2 insertions, 9 deletions

diff --git a/modules/paths.py b/modules/paths.py
index d991cc71..0e1e00e7 100644
--- a/modules/paths.py
+++ b/modules/paths.py
@@ -1,16 +1,9 @@
-import argparse

 import os

 import sys

-import modules.safe

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

 

-script_path = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))

+import modules.safe

 

-# Parse the --data-dir flag first so we can use it as a base for our other argument default values

-parser = argparse.ArgumentParser(add_help=False)

-parser.add_argument("--data-dir", type=str, default=os.path.dirname(os.path.dirname(os.path.realpath(__file__))), help="base path where all user data is stored",)

-cmd_opts_pre = parser.parse_known_args()[0]

-data_path = cmd_opts_pre.data_dir

-models_path = os.path.join(data_path, "models")

 

 # data_path = cmd_opts_pre.data

 sys.path.insert(0, script_path)