From 25cc12b89d803b91c7230833d96bef66f97088a6 Mon Sep 17 00:00:00 2001
From: ronny abraham <ronny.abraham@ymail.com>
Date: Fri, 7 Jul 2023 17:33:55 +0300
Subject: [PATCH] fixed a probem with modules.utils import virtualenv so it now
 calls customfabric.modules... also fixed an annoying invalid escape sequence
 \[ bug by turning it into a raw string.  finally got rid of an unneeded
 variable 'settings_coveragepath'

---
 modules/conf_setup.py          | 19 +++++++++++++++++--
 modules/configuration_setup.py | 15 ++++++++++++++-
 modules/django.py              | 12 +++++++-----
 modules/docker.py              | 22 +++++++++++++++++++---
 4 files changed, 57 insertions(+), 11 deletions(-)

diff --git a/modules/conf_setup.py b/modules/conf_setup.py
index 37b9fe3..a87ef18 100644
--- a/modules/conf_setup.py
+++ b/modules/conf_setup.py
@@ -1,9 +1,24 @@
 
 from fabric.operations import run, put
 from fabric.api import env, task
-import os
 
-from .maintenance import _get_configuration_path, load_configuration
+import os
+import sys
+import pathlib
+
+dir_parent = pathlib.Path(os.path.abspath(__file__)).parents[2]
+sys.path.append(str(dir_parent))
+
+try:
+    from customfabric.modules.maintenance import _get_configuration_path
+    from customfabric.modules.maintenance import load_configuration
+
+except ImportError:
+    raise
+
+# import os
+#
+# from .maintenance import _get_configuration_path, load_configuration
 
 
 @task
diff --git a/modules/configuration_setup.py b/modules/configuration_setup.py
index e0c24ae..aa60045 100644
--- a/modules/configuration_setup.py
+++ b/modules/configuration_setup.py
@@ -4,7 +4,20 @@ from fabric.api import env
 
 import os
 import sys
-import utils
+import pathlib
+
+dir_parent = pathlib.Path(os.path.abspath(__file__)).parents[2]
+sys.path.append(str(dir_parent))
+
+try:
+    import customfabric.modules.utils as utils
+
+except ImportError:
+    raise
+
+# import os
+# import sys
+# import utils
 
 
 def check_is_conf(section, handle_error=False):
diff --git a/modules/django.py b/modules/django.py
index e616543..82eb639 100644
--- a/modules/django.py
+++ b/modules/django.py
@@ -1,5 +1,4 @@
 from fabric.api import env, local, task
-from modules.utils import virtualenv
 from fabric.context_managers import lcd
 import fabric.operations as fabric_ops
 from fabric.contrib.files import exists
@@ -12,6 +11,7 @@ dir_parent = pathlib.Path(os.path.abspath(__file__)).parents[2]
 sys.path.append(str(dir_parent))
 
 try:
+    from customfabric.modules.utils import virtualenv
     from customfabric.modules.utils import loggify, print_run, booleanize
     from customfabric.modules.utils import generate_template_build_path
     from customfabric.modules.utils import generate_template_files_path
@@ -21,6 +21,7 @@ try:
 except ImportError:
     raise
 
+# from modules.utils import virtualenv
 # from .utils import loggify, print_run, booleanize
 # from .utils import generate_template_build_path
 # from .utils import generate_template_files_path
@@ -244,6 +245,10 @@ def coverage(application, args="test", workingdir=None, outputdir=None,
     manage(args=args, workingdir=workingdir, prefix=prefix, suffix=suffix)
 
 
+print("method coverage doc: %s" % coverage.__doc__)
+print("method coverage run.doc: %s" % coverage.run.__doc__)
+
+
 @task
 def admin(args="help"):
     configuration = env.config
@@ -819,9 +824,6 @@ def edit(param='help'):
     if param == 'coverage':
         coverage_test()
 
-    settings_coveragepath = "{projectroot}/share/coverage/settings.cfg".format(
-        projectroot=configuration.paths.project.root)
-
     file_debug_handler = configuration.logging.django.handlers.file_debug
 
     # locations = ['coverage', 'gunicorn', 'gunicorn_link', 'gunicorn_build',
@@ -1015,7 +1017,7 @@ def fixtures(appname=None, backup=False):
     # "[localhost] out:" is printed
 
     if configuration.project.host == 'localhost':
-        p = re.compile("\[localhost\] out:")
+        p = re.compile(r"\[localhost\] out:")
 
         for match in p.finditer(output):
             pass
diff --git a/modules/docker.py b/modules/docker.py
index c166c48..4a2030b 100644
--- a/modules/docker.py
+++ b/modules/docker.py
@@ -2,9 +2,25 @@ from fabric.api import env, task
 
 from fabric.contrib.files import upload_template
 
-from .utils import loggify, generate_template_files_path, booleanize
-from .utils import generate_template_build_path, print_console
-from .utils import executize
+import os
+import sys
+import pathlib
+
+dir_parent = pathlib.Path(os.path.abspath(__file__)).parents[2]
+sys.path.append(str(dir_parent))
+
+try:
+    from customfabric.modules.utils import loggify, booleanize
+    from customfabric.modules.utils import generate_template_files_path
+    from customfabric.modules.utils import generate_template_build_path
+    from customfabric.modules.utils import executize, print_console
+
+except ImportError:
+    raise
+
+# from .utils import loggify, generate_template_files_path, booleanize
+# from .utils import generate_template_build_path, print_console
+# from .utils import executize
 
 
 @task