comparison src/core/sat_main.py @ 579:133078b82ca8

removed CONST from sat_main as it is already in default_config
author Goffi <goffi@goffi.org>
date Wed, 09 Jan 2013 22:43:41 +0100
parents ca13633d3b6b
children 952322b1d490
comparison
equal deleted inserted replaced
578:28331ecf0a65 579:133078b82ca8
17 17
18 You should have received a copy of the GNU Affero General Public License 18 You should have received a copy of the GNU Affero General Public License
19 along with this program. If not, see <http://www.gnu.org/licenses/>. 19 along with this program. If not, see <http://www.gnu.org/licenses/>.
20 """ 20 """
21 21
22 CONST = {
23 'client_name' : u'SàT (Salut à toi)',
24 'client_version' : u'0.2.0D', #Please add 'D' at the end for dev versions
25 }
26
27 from twisted.application import service 22 from twisted.application import service
28 from twisted.internet import defer 23 from twisted.internet import defer
29 24
30 from twisted.words.protocols.jabber import jid, xmlstream 25 from twisted.words.protocols.jabber import jid, xmlstream
31 from twisted.words.xish import domish 26 from twisted.words.xish import domish
40 from logging import debug, info, warning, error 35 from logging import debug, info, warning, error
41 36
42 import sys 37 import sys
43 import os.path 38 import os.path
44 39
40 from sat.core.default_config import CONST
45 from sat.core import xmpp 41 from sat.core import xmpp
46 from sat.core.exceptions import ProfileUnknownError, UnknownEntityError, ProfileNotInCacheError 42 from sat.core.exceptions import ProfileUnknownError, UnknownEntityError, ProfileNotInCacheError
47 from sat.memory.memory import Memory 43 from sat.memory.memory import Memory
48 from sat.tools.xml_tools import tupleList2dataForm 44 from sat.tools.xml_tools import tupleList2dataForm
49 from sat.tools.misc import TriggerManager 45 from sat.tools.misc import TriggerManager