refactor: Move text_helpers into util module

9 files changed, 10 insertions, 11 deletions

diff --git a/gajim/common/styling.py b/gajim/common/styling.py
index 6b82ae346..ea2e1227e 100644
--- a/gajim/common/styling.py
+++ b/gajim/common/styling.py
@@ -30,7 +30,7 @@ from gajim.common import regex
 from gajim.common.const import URIType
 from gajim.common.helpers import parse_uri as analyze_uri
 from gajim.common.helpers import validate_jid
-from gajim.common.text_helpers import escape_iri_query
+from gajim.common.util.text import escape_iri_query
 
 PRE = '`'
 STRONG = '*'
diff --git a/gajim/common/text_helpers.py b/gajim/common/util/text.py
index a37ceb965..a37ceb965 100644
--- a/gajim/common/text_helpers.py
+++ b/gajim/common/util/text.py
diff --git a/gajim/gtk/chat_stack.py b/gajim/gtk/chat_stack.py
index 37fc1d43e..509b8c877 100644
--- a/gajim/gtk/chat_stack.py
+++ b/gajim/gtk/chat_stack.py
@@ -44,7 +44,7 @@ from gajim.common.modules.contacts import GroupchatParticipant
 from gajim.common.preview_helpers import split_geo_uri
 from gajim.common.preview_helpers import format_geo_coords
 from gajim.common.structs import OutgoingMessage
-from gajim.common.text_helpers import remove_invalid_xml_chars
+from gajim.common.util.text import remove_invalid_xml_chars
 from gajim.common.types import ChatContactT
 
 from .chat_banner import ChatBanner
diff --git a/gajim/gtk/menus.py b/gajim/gtk/menus.py
index 3bec6c2ed..ff6f57d83 100644
--- a/gajim/gtk/menus.py
+++ b/gajim/gtk/menus.py
@@ -45,7 +45,7 @@ from gajim.common.const import URIType
 from gajim.common.const import XmppUriQuery
 from gajim.common.preview import Preview
 from gajim.common.structs import URI
-from gajim.common.text_helpers import escape_iri_path_segment
+from gajim.common.util.text import escape_iri_path_segment
 from gajim.common.modules.contacts import GroupchatContact
 from gajim.common.modules.contacts import can_add_to_roster
 
diff --git a/gajim/gtk/preview_audio.py b/gajim/gtk/preview_audio.py
index ad892a252..cbebb0ffd 100644
--- a/gajim/gtk/preview_audio.py
+++ b/gajim/gtk/preview_audio.py
@@ -30,7 +30,7 @@ except Exception:
 
 from gajim.common import app
 from gajim.common.i18n import _
-from gajim.common.text_helpers import format_duration
+from gajim.common.util.text import format_duration
 from gajim.common.preview import AudioSampleT
 
 from .builder import get_builder
diff --git a/gajim/gtk/vcard_grid.py b/gajim/gtk/vcard_grid.py
index 631ffbc75..290adfcfa 100644
--- a/gajim/gtk/vcard_grid.py
+++ b/gajim/gtk/vcard_grid.py
@@ -30,7 +30,7 @@ from gajim.common.const import URIType
 from gajim.common.helpers import open_uri
 from gajim.common.helpers import parse_uri
 from gajim.common.structs import URI
-from gajim.common.text_helpers import escape_iri_path_segment
+from gajim.common.util.text import escape_iri_path_segment
 from gajim.gui.util import gtk_month
 from gajim.gui.util import python_month
 
diff --git a/pyproject.toml b/pyproject.toml
index fff3d99f8..c958e3772 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -57,7 +57,6 @@ include = [
     "gajim/common/storage/*",
     "gajim/common/styling.py",
     "gajim/common/task_manager.py",
-    "gajim/common/text_helpers.py",
     "gajim/common/util/*",
     "gajim/gajim.py",
     "gajim/gajim_remote.py",
diff --git a/test/no_gui/test_styling.py b/test/no_gui/test_styling.py
index eeea4413f..54fedb643 100644
--- a/test/no_gui/test_styling.py
+++ b/test/no_gui/test_styling.py
@@ -15,7 +15,7 @@ from gajim.common.styling import EmphasisSpan
 from gajim.common.styling import StrikeSpan
 from gajim.common.styling import Hyperlink
 from gajim.common.styling import process_uris
-from gajim.common.text_helpers import escape_iri_query
+from gajim.common.util.text import escape_iri_query
 
 
 app.settings = MagicMock()
diff --git a/test/no_gui/test_text_helpers.py b/test/no_gui/test_text_util.py
index 89b464021..26df53b08 100644
--- a/test/no_gui/test_text_helpers.py
+++ b/test/no_gui/test_text_util.py
@@ -1,9 +1,9 @@
 import unittest
 
-from gajim.common.text_helpers import escape_iri_path_segment
-from gajim.common.text_helpers import jid_to_iri
-from gajim.common.text_helpers import format_duration
-from gajim.common.text_helpers import remove_invalid_xml_chars
+from gajim.common.util.text import escape_iri_path_segment
+from gajim.common.util.text import jid_to_iri
+from gajim.common.util.text import format_duration
+from gajim.common.util.text import remove_invalid_xml_chars
 
 
 class Test(unittest.TestCase):