From 9016441fcf6f964f686ed5f687dadab267d0b6b2 Mon Sep 17 00:00:00 2001
From: Denis Fomin <fominde@gmail.com>
Date: Sun, 12 Aug 2012 11:24:22 +0400
Subject: [PATCH] remove command_system modules from demandimport.ignore
---
src/chat_control.py | 19 ++++++++++++++-----
src/gajim.py | 4 +---
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/chat_control.py b/src/chat_control.py
index 6b3c601b38..2885e4081b 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -64,8 +64,8 @@ from command_system.implementation.hosts import ChatCommands
# Here we load the module with the standard commands, so they are being detected
# and dispatched.
-import command_system.implementation.standard
-import command_system.implementation.execute
+from command_system.implementation.standard import StandardChatCommands
+from command_system.implementation.execute import Execute, Show
try:
import gtkspell
@@ -83,7 +83,15 @@ if dbus_support.supported:
##!/bin/sh
#LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
#echo "{_('en'):'en'",$LANG"}"
-langs = {_('English'): 'en', _('Belarusian'): 'be', _('Bulgarian'): 'bg', _('Breton'): 'br', _('Czech'): 'cs', _('German'): 'de', _('Greek'): 'el', _('British'): 'en_GB', _('Esperanto'): 'eo', _('Spanish'): 'es', _('Basque'): 'eu', _('French'): 'fr', _('Croatian'): 'hr', _('Italian'): 'it', _('Norwegian (b)'): 'nb', _('Dutch'): 'nl', _('Norwegian'): 'no', _('Polish'): 'pl', _('Portuguese'): 'pt', _('Brazilian Portuguese'): 'pt_BR', _('Russian'): 'ru', _('Serbian'): 'sr', _('Slovak'): 'sk', _('Swedish'): 'sv', _('Chinese (Ch)'): 'zh_CN'}
+langs = {_('English'): 'en', _('Belarusian'): 'be', _('Bulgarian'): 'bg',
+ _('Breton'): 'br', _('Czech'): 'cs', _('German'): 'de',
+ _('Greek'): 'el', _('British'): 'en_GB', _('Esperanto'): 'eo',
+ _('Spanish'): 'es', _('Basque'): 'eu', _('French'): 'fr',
+ _('Croatian'): 'hr', _('Italian'): 'it', _('Norwegian (b)'): 'nb',
+ _('Dutch'): 'nl', _('Norwegian'): 'no', _('Polish'): 'pl',
+ _('Portuguese'): 'pt', _('Brazilian Portuguese'): 'pt_BR',
+ _('Russian'): 'ru', _('Serbian'): 'sr', _('Slovak'): 'sk',
+ _('Swedish'): 'sv', _('Chinese (Ch)'): 'zh_CN'}
if gajim.config.get('use_speller') and HAS_GTK_SPELL:
# loop removing non-existent dictionaries
@@ -2293,7 +2301,7 @@ class ChatControl(ChatControlBase):
else:
displaymarking = None
self.print_conversation(message, self.contact.jid, encrypted=encrypted,
- xep0184_id=xep0184_id, xhtml=xhtml, displaymarking=displaymarking)
+ xep0184_id=xep0184_id, xhtml=xhtml, displaymarking=displaymarking)
ChatControlBase.send_message(self, message, keyID, type_='chat',
chatstate=chatstate_to_send, xhtml=xhtml, callback=_on_sent,
@@ -2886,7 +2894,8 @@ class ChatControl(ChatControlBase):
except exceptions.DatabaseMalformed:
import common.logger
dialogs.ErrorDialog(_('Database Error'),
- _('The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost).') % common.logger.LOG_DB_PATH)
+ _('The database file (%s) cannot be read. Try to repair it or \
+ remove it (all history will be lost).') % common.logger.LOG_DB_PATH)
rows = []
local_old_kind = None
for row in rows: # row[0] time, row[1] has kind, row[2] the message
diff --git a/src/gajim.py b/src/gajim.py
index da23c7f63b..99d3c05096 100644
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -65,9 +65,7 @@ if os.name == 'nt':
from common import demandimport
demandimport.enable()
demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n',
- 'logging.NullHandler', 'dbus.service',
- 'command_system.implementation.standard',
- 'command_system.implementation.execute', 'OpenSSL.SSL', 'OpenSSL.crypto',
+ 'logging.NullHandler', 'dbus.service', 'OpenSSL.SSL', 'OpenSSL.crypto',
'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic',
'Crypto.PublicKey']
--
GitLab