From 5ff9e9febf62416986a95d8f16d0730172ee56ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6rist?= Date: Sat, 21 Jul 2018 14:35:28 +0200 Subject: [PATCH] Move dataforms into modules folder --- gajim/adhoc_commands.py | 3 ++- gajim/common/caps_cache.py | 2 +- gajim/common/connection_handlers_events.py | 2 +- gajim/common/modules/adhoc_commands.py | 2 +- gajim/common/{ => modules}/dataforms.py | 5 +---- gajim/common/modules/muc.py | 2 +- gajim/common/modules/pubsub.py | 2 +- gajim/config.py | 2 +- gajim/dataforms_widget.py | 2 +- gajim/dialogs.py | 2 +- gajim/groupchat_control.py | 2 +- gajim/gtk/single_message.py | 2 +- gajim/negotiation.py | 2 +- gajim/search_window.py | 2 +- 14 files changed, 15 insertions(+), 17 deletions(-) rename gajim/common/{ => modules}/dataforms.py (99%) diff --git a/gajim/adhoc_commands.py b/gajim/adhoc_commands.py index b74e8c9b7..d99c1ab89 100644 --- a/gajim/adhoc_commands.py +++ b/gajim/adhoc_commands.py @@ -29,13 +29,14 @@ from gi.repository import Gtk import nbxmpp from gajim.common import app -from gajim.common import dataforms +from gajim.common.modules import dataforms from gajim.common import ged from gajim import gtkgui_helpers from gajim.gtk import HigDialog from gajim import dataforms_widget + class CommandWindow: """ Class for a window for single ad-hoc commands session diff --git a/gajim/common/caps_cache.py b/gajim/common/caps_cache.py index e26e19677..659f2f88b 100644 --- a/gajim/common/caps_cache.py +++ b/gajim/common/caps_cache.py @@ -449,7 +449,7 @@ class MucCapsCache: features.append(child.getAttr('var')) elif child.getName() == 'x': if child.getNamespace() == nbxmpp.NS_DATA: - from gajim.common import dataforms + from gajim.common.modules import dataforms data.append(dataforms.ExtendForm(node=child)) if nbxmpp.NS_MUC not in features: diff --git a/gajim/common/connection_handlers_events.py b/gajim/common/connection_handlers_events.py index 8181057d6..78bd46749 100644 --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -36,7 +36,7 @@ from gajim.common import nec from gajim.common import helpers from gajim.common import app from gajim.common import i18n -from gajim.common import dataforms +from gajim.common.modules import dataforms from gajim.common.zeroconf.zeroconf import Constant from gajim.common.const import KindConstant, SSLError from gajim.common.pep import SUPPORTED_PERSONAL_USER_EVENTS diff --git a/gajim/common/modules/adhoc_commands.py b/gajim/common/modules/adhoc_commands.py index acbbb60db..ed19e5bc3 100644 --- a/gajim/common/modules/adhoc_commands.py +++ b/gajim/common/modules/adhoc_commands.py @@ -23,7 +23,7 @@ import logging import nbxmpp from gajim.common import helpers -from gajim.common import dataforms +from gajim.common.modules import dataforms from gajim.common import app from gajim.common.nec import NetworkIncomingEvent diff --git a/gajim/common/dataforms.py b/gajim/common/modules/dataforms.py similarity index 99% rename from gajim/common/dataforms.py rename to gajim/common/modules/dataforms.py index 6ad3657f8..1f48371a9 100644 --- a/gajim/common/dataforms.py +++ b/gajim/common/modules/dataforms.py @@ -16,10 +16,7 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see . -""" -This module contains wrappers for different parts of data forms (XEP-0004). For -information how to use them, read documentation -""" +# XEP-0004: Data Forms import nbxmpp diff --git a/gajim/common/modules/muc.py b/gajim/common/modules/muc.py index 5acf30e14..029f19c56 100644 --- a/gajim/common/modules/muc.py +++ b/gajim/common/modules/muc.py @@ -20,7 +20,7 @@ import logging import nbxmpp from gajim.common import i18n -from gajim.common import dataforms +from gajim.common.modules import dataforms from gajim.common import app from gajim.common import helpers from gajim.common.nec import NetworkIncomingEvent diff --git a/gajim/common/modules/pubsub.py b/gajim/common/modules/pubsub.py index b26f24ef3..14d093099 100644 --- a/gajim/common/modules/pubsub.py +++ b/gajim/common/modules/pubsub.py @@ -25,7 +25,7 @@ import logging import nbxmpp from gajim.common import app -from gajim.common import dataforms +from gajim.common.modules import dataforms from gajim.common.nec import NetworkIncomingEvent log = logging.getLogger('gajim.c.m.pubsub') diff --git a/gajim/config.py b/gajim/config.py index e7d5e83b8..9c26b7d55 100644 --- a/gajim/config.py +++ b/gajim/config.py @@ -62,7 +62,7 @@ from gajim.gtk import WarningDialog from gajim.common import helpers from gajim.common import app from gajim.common import connection -from gajim.common import dataforms +from gajim.common.modules import dataforms from gajim.common import ged from gajim.common import configpaths from gajim.accounts_window import AccountsWindow diff --git a/gajim/dataforms_widget.py b/gajim/dataforms_widget.py index ba7cf20ef..f7bac03c0 100644 --- a/gajim/dataforms_widget.py +++ b/gajim/dataforms_widget.py @@ -34,7 +34,7 @@ import base64 from gajim import gtkgui_helpers -from gajim.common import dataforms +from gajim.common.modules import dataforms from gajim.common import helpers from gajim.common import app diff --git a/gajim/dialogs.py b/gajim/dialogs.py index e86585a79..a46c8a472 100644 --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -51,7 +51,7 @@ from gajim.common.const import MOODS from gajim.common import app from gajim.common import helpers from gajim.common import i18n -from gajim.common import dataforms +from gajim.common.modules import dataforms from gajim.common.exceptions import GajimGeneralException # Compat with Gajim 1.0.3 for plugins diff --git a/gajim/groupchat_control.py b/gajim/groupchat_control.py index 5ac89cb74..5fe1ce40c 100644 --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -55,7 +55,7 @@ from enum import IntEnum, unique from gajim.common import events from gajim.common import app from gajim.common import helpers -from gajim.common import dataforms +from gajim.common.modules import dataforms from gajim.common import ged from gajim.common import i18n from gajim.common import contacts diff --git a/gajim/gtk/single_message.py b/gajim/gtk/single_message.py index a10efcc3f..e78d8968a 100644 --- a/gajim/gtk/single_message.py +++ b/gajim/gtk/single_message.py @@ -16,7 +16,7 @@ from gi.repository import Gdk from gi.repository import GLib from gajim.common import app -from gajim.common import dataforms +from gajim.common.modules import dataforms from gajim.common import helpers from gajim.common.connection_handlers_events import MessageOutgoingEvent from gajim.gtk import ErrorDialog diff --git a/gajim/negotiation.py b/gajim/negotiation.py index 250512e08..8bfa18455 100644 --- a/gajim/negotiation.py +++ b/gajim/negotiation.py @@ -22,7 +22,7 @@ from gajim import gtkgui_helpers from gajim import dataforms_widget -from gajim.common import dataforms +from gajim.common.modules import dataforms from gajim.common import app import nbxmpp diff --git a/gajim/search_window.py b/gajim/search_window.py index 092d48d54..20cd9799f 100644 --- a/gajim/search_window.py +++ b/gajim/search_window.py @@ -24,7 +24,7 @@ from gi.repository import Gtk from gi.repository import Gdk from gajim.common import app -from gajim.common import dataforms +from gajim.common.modules import dataforms from gajim.common import ged from gajim import gtkgui_helpers