Move dataforms into modules folder

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

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:

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

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
 

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 <http://www.gnu.org/licenses/>.
 
-"""
+# XEP-0004: Data Forms
-This module contains wrappers for different parts of data forms (XEP-0004). For
-information how to use them, read documentation
-"""
 
 import nbxmpp
 

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

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')

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

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
 

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

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

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

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
 

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