Philipp Hörist pushed to branch master at gajim / gajim

Commits: 4c1bfda4 by Philipp Hörist at 2018-04-23T18:32:01+02:00 Fix const imports

- - - - -

8 changed files:

- gajim/chat_control.py - gajim/command_system/implementation/standard.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/message_archiving.py - gajim/history_manager.py - gajim/history_window.py - gajim/session.py

Changes:

===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -44,13 +44,12 @@ from gajim.common import ged from gajim.common import i18n from gajim.common.stanza_session import EncryptedStanzaSession, ArchivingStanzaSession from gajim.common.contacts import GC_Contact -from gajim.common.logger import KindConstant from nbxmpp.protocol import NS_XHTML, NS_XHTML_IM, NS_FILE, NS_MUC from nbxmpp.protocol import NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO from nbxmpp.protocol import NS_JINGLE_ICE_UDP, NS_JINGLE_FILE_TRANSFER_5 from nbxmpp.protocol import NS_CHATSTATES from gajim.common.connection_handlers_events import MessageOutgoingEvent -from gajim.common.const import AvatarSize +from gajim.common.const import AvatarSize, KindConstant

from gajim.command_system.implementation.hosts import ChatCommands from gajim.chat_control_base import ChatControlBase

===================================== gajim/command_system/implementation/standard.py ===================================== --- a/gajim/command_system/implementation/standard.py +++ b/gajim/command_system/implementation/standard.py @@ -24,7 +24,7 @@ from gajim import dialogs from gajim.common import app from gajim.common import helpers from gajim.common.exceptions import GajimGeneralException -from gajim.common.logger import KindConstant +from gajim.common.const import KindConstant

from gajim.command_system.errors import CommandError from gajim.command_system.framework import CommandContainer, command, doc

===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -60,6 +60,7 @@ from gajim.common.connection_handlers_events import * from gajim.common import ged from gajim.common import nec from gajim.common.nec import NetworkEvent +from gajim.common.const import KindConstant

from gajim.common.jingle import ConnectionJingle

===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -39,7 +39,7 @@ from gajim.common import app from gajim.common import i18n from gajim.common import dataforms from gajim.common.zeroconf.zeroconf import Constant -from gajim.common.logger import KindConstant +from gajim.common.const import KindConstant from gajim.common.pep import SUPPORTED_PERSONAL_USER_EVENTS from gajim.common.jingle_transport import JingleTransportSocks5 from gajim.common.file_props import FilesProp

===================================== gajim/common/message_archiving.py ===================================== --- a/gajim/common/message_archiving.py +++ b/gajim/common/message_archiving.py @@ -26,8 +26,7 @@ import nbxmpp from gajim.common import app from gajim.common import ged from gajim.common import helpers -from gajim.common.logger import KindConstant, JIDConstant -from gajim.common.const import ArchiveState +from gajim.common.const import ArchiveState, JIDConstant from gajim.common.caps_cache import muc_caps_cache import gajim.common.connection_handlers_events as ev

===================================== gajim/history_manager.py ===================================== --- a/gajim/history_manager.py +++ b/gajim/history_manager.py @@ -87,7 +87,8 @@ if is_standalone():

from gajim.common import app from gajim import gtkgui_helpers -from gajim.common.logger import LOG_DB_PATH, JIDConstant, KindConstant +from gajim.common.logger import LOG_DB_PATH +from gajim.common.const import JIDConstant, KindConstant from gajim.common import helpers from gajim import dialogs

===================================== gajim/history_window.py ===================================== --- a/gajim/history_window.py +++ b/gajim/history_window.py @@ -41,7 +41,7 @@ from gajim.common import app from gajim.common import helpers from gajim.common import exceptions

-from gajim.common.logger import ShowConstant, KindConstant +from gajim.common.const import ShowConstant, KindConstant

@unique class InfoColumn(IntEnum):

===================================== gajim/session.py ===================================== --- a/gajim/session.py +++ b/gajim/session.py @@ -30,7 +30,7 @@ from gajim.common import contacts from gajim.common import ged from gajim.common.connection_handlers_events import ChatstateReceivedEvent, \ InformationEvent -from gajim.common.logger import KindConstant +from gajim.common.const import KindConstant from gajim import message_control from gajim import notify from gajim import dialogs

View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4c1bfda48df396765e1e046b7b6b22d0fbb...

--- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4c1bfda48df396765e1e046b7b6b22d0fbb... You're receiving this email because of your account on dev.gajim.org.