Commits

commits@gajim.org

17632 discussions

gajim: updated french translation
by Yann Leboulanger 18 Mar '12

18 Mar '12

changeset 113257a46c8b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=113257a46c8b description: updated french translation diffstat: po/fr.po | 3621 ++++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 2002 insertions(+), 1619 deletions(-) diffs (truncated from 8650 to 300 lines): diff -r 264a19cacb3a -r 113257a46c8b po/fr.po --- a/po/fr.po Sun Mar 18 12:17:55 2012 +0100 +++ b/po/fr.po Sun Mar 18 12:18:04 2012 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim 0.12 svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-19 00:05+0200\n" +"POT-Creation-Date: 2012-03-18 12:14+0100\n" "PO-Revision-Date: 2011-05-30 08:28+0100\n" "Last-Translator: Florent Le Coz <louizatakk(a)fedoraproject.org>\n" "Language-Team: <>\n" @@ -31,7 +31,7 @@ msgid "_Add Contact..." msgstr "_Ajouter un contact..." -#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:20 +#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:19 msgid "_Discover Services" msgstr "_Découvrir les services" @@ -51,7 +51,7 @@ msgid "_Personal Events" msgstr "Évènements P_ersonnels" -#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:25 +#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24 msgid "_Start Chat..." msgstr "Commencer une _discussion..." @@ -111,7 +111,7 @@ msgstr "Je veux _créer un nouveau compte" #: ../data/gui/account_creation_wizard_window.ui.h:15 -#: ../data/gui/accounts_window.ui.h:28 +#: ../data/gui/accounts_window.ui.h:30 msgid "If checked, Gajim will remember the password for this account" msgstr "" "Si cette case est cochée, Gajim va retenir le mot de passe pour ce compte" @@ -121,13 +121,14 @@ msgstr "Gérer..." #: ../data/gui/account_creation_wizard_window.ui.h:17 -#: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3 -#: ../src/config.py:1289 ../src/config.py:1392 ../src/config.py:1703 -#: ../src/config.py:1708 ../src/config.py:2274 ../src/config.py:2353 -#: ../src/config.py:2366 ../src/config.py:3644 ../src/config.py:3719 +#: ../data/gui/accounts_window.ui.h:41 ../data/gui/change_mood_dialog.ui.h:3 +#: ../src/config.py:1265 ../src/config.py:1279 ../src/config.py:1284 +#: ../src/config.py:1332 ../src/config.py:1435 ../src/config.py:1746 +#: ../src/config.py:1751 ../src/config.py:2327 ../src/config.py:2406 +#: ../src/config.py:2419 ../src/config.py:3703 ../src/config.py:3778 #: ../src/dialogs.py:311 ../src/dialogs.py:313 ../src/dialogs.py:519 -#: ../src/dialogs.py:532 ../src/roster_window.py:3096 -#: ../src/roster_window.py:3102 ../src/roster_window.py:3107 +#: ../src/dialogs.py:532 ../src/roster_window.py:3133 +#: ../src/roster_window.py:3139 ../src/roster_window.py:3144 msgid "None" msgstr "Aucun" @@ -136,7 +137,7 @@ msgstr "Prox_y :" #: ../data/gui/account_creation_wizard_window.ui.h:19 -#: ../data/gui/accounts_window.ui.h:48 +#: ../data/gui/accounts_window.ui.h:50 msgid "Save pass_word" msgstr "Sauver le mot de _passe" @@ -157,7 +158,7 @@ "au réseau Jabber." #: ../data/gui/account_creation_wizard_window.ui.h:24 -#: ../data/gui/roster_window.ui.h:18 +#: ../data/gui/roster_window.ui.h:17 msgid "_Advanced" msgstr "_Avancées" @@ -170,12 +171,12 @@ msgstr "Nom d'_Hôte :" #: ../data/gui/account_creation_wizard_window.ui.h:27 -#: ../data/gui/accounts_window.ui.h:62 +#: ../data/gui/accounts_window.ui.h:63 msgid "_Jabber ID:" msgstr "Identifiant _Jabber : " #: ../data/gui/account_creation_wizard_window.ui.h:28 -#: ../data/gui/accounts_window.ui.h:64 +#: ../data/gui/accounts_window.ui.h:65 #: ../data/gui/manage_bookmarks_window.ui.h:8 msgid "_Password:" msgstr "Mot de _passe : " @@ -217,31 +218,41 @@ msgid "Accounts" msgstr "Comptes" -#: ../data/gui/accounts_window.ui.h:8 +#. Change label for accept_button to action name instead of 'OK'. +#: ../data/gui/accounts_window.ui.h:8 ../src/dialogs.py:3387 +#: ../src/dialogs.py:3433 +msgid "Add" +msgstr "Ajouter" + +#: ../data/gui/accounts_window.ui.h:9 msgid "Administration operations" msgstr "Opérations d'administration" -#: ../data/gui/accounts_window.ui.h:9 +#: ../data/gui/accounts_window.ui.h:10 msgid "Anonymous authentication" msgstr "Authentification anonyme" -#: ../data/gui/accounts_window.ui.h:10 +#: ../data/gui/accounts_window.ui.h:11 msgid "Auto-reconnect when connection is lost" msgstr "Reconnexion automatique quand la connexion est perdue" -#: ../data/gui/accounts_window.ui.h:11 +#: ../data/gui/accounts_window.ui.h:12 msgid "Browse..." msgstr "_Parcourir..." -#: ../data/gui/accounts_window.ui.h:12 +#: ../data/gui/accounts_window.ui.h:13 msgid "C_onnect on Gajim startup" msgstr "C_onnexion au démarrage" -#: ../data/gui/accounts_window.ui.h:13 +#: ../data/gui/accounts_window.ui.h:14 +msgid "Certificate is e_ncrypted" +msgstr "Le certificat est chiffré" + +#: ../data/gui/accounts_window.ui.h:15 msgid "Chan_ge Password" msgstr "Chan_ger le mot de passe" -#: ../data/gui/accounts_window.ui.h:14 +#: ../data/gui/accounts_window.ui.h:16 msgid "" "Check this so Gajim will ask you before sending your password over an " "insecure connection." @@ -249,50 +260,52 @@ "Cochez cette case pour que Gajim vous demande avant d'envoyer votre mot de " "passe via une connexion non-sécurisée" -#: ../data/gui/accounts_window.ui.h:15 -msgid "Choose Client Cert" -msgstr "Choisissez le certificat client" - -#: ../data/gui/accounts_window.ui.h:16 +#: ../data/gui/accounts_window.ui.h:17 msgid "Choose _Key..." msgstr "Choisissez une _clé..." -#: ../data/gui/accounts_window.ui.h:17 +#: ../data/gui/accounts_window.ui.h:18 msgid "Click to change account's password" msgstr "Cliquez pour changer le mot de passe du compte" -#: ../data/gui/accounts_window.ui.h:18 +#: ../data/gui/accounts_window.ui.h:19 msgid "Click to request authorization to all contacts of another account" msgstr "" "Cliquez pour demander l'autorisation à tous les contacts d'un autre compte" -#: ../data/gui/accounts_window.ui.h:19 +#: ../data/gui/accounts_window.ui.h:20 msgid "Client certificate" msgstr "Certificat client" -#: ../data/gui/accounts_window.ui.h:20 +#: ../data/gui/accounts_window.ui.h:21 msgid "Co_nnect on Gajim startup" msgstr "C_onnexion au démarrage de Gajim" -#: ../data/gui/accounts_window.ui.h:21 +#: ../data/gui/accounts_window.ui.h:22 msgid "Connection" msgstr "Connexion" -#: ../data/gui/accounts_window.ui.h:22 +#. Change label for accept_button to action name instead of 'OK'. +#: ../data/gui/accounts_window.ui.h:23 ../src/dialogs.py:3391 +#: ../src/dialogs.py:3488 +msgid "Delete" +msgstr "Supprimer" + +#: ../data/gui/accounts_window.ui.h:24 #: ../data/gui/zeroconf_information_window.ui.h:2 msgid "E-Mail:" msgstr "Courriel :" -#: ../data/gui/accounts_window.ui.h:23 +#: ../data/gui/accounts_window.ui.h:25 #: ../data/gui/zeroconf_information_window.ui.h:3 msgid "First Name:" msgstr "Prénom :" #. No configured account -#: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5 -#: ../src/common/helpers.py:1148 ../src/common/helpers.py:1160 -#: ../src/notify.py:474 ../src/notify.py:497 ../src/notify.py:546 -#: ../src/notify.py:562 +#: ../data/gui/accounts_window.ui.h:26 ../data/gui/roster_window.ui.h:5 +#: ../src/common/helpers.py:1168 ../src/common/helpers.py:1180 +#: ../src/notify.py:314 ../src/notify.py:337 ../src/notify.py:387 +#: ../src/notify.py:403 msgid "Gajim" msgstr "Gajim" @@ -300,13 +313,14 @@ #. FIXME: Ugly workaround. #. Maybe we haven't been in any group (defaults to General) #. General group cannot be changed -#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:56 -#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:124 -#: ../src/roster_window.py:3038 ../src/roster_window.py:5643 +#: ../data/gui/accounts_window.ui.h:27 ../data/gui/preferences_window.ui.h:57 +#: ../src/common/contacts.py:132 ../src/dialogs.py:112 ../src/dialogs.py:124 +#: ../src/roster_window.py:3075 ../src/roster_window.py:4142 +#: ../src/roster_window.py:5732 msgid "General" msgstr "Général" -#: ../data/gui/accounts_window.ui.h:26 +#: ../data/gui/accounts_window.ui.h:28 msgid "" "If checked, Gajim will also broadcast some more IPs except from just your " "IP, so file transfer has higher chances of working." @@ -314,13 +328,13 @@ "Si cette case est cochée, Gajim va diffuser des adresses IP en plus de la " "vôtre, les transferts de fichiers ont ainsi plus de chance de fonctionner." -#: ../data/gui/accounts_window.ui.h:27 +#: ../data/gui/accounts_window.ui.h:29 msgid "If checked, Gajim will get the password from a GPG agent like seahorse" msgstr "" "Si cette case est cochée, Gajim obtiendra le mot de passe depuis un agent " "GPG comme seahorse" -#: ../data/gui/accounts_window.ui.h:29 +#: ../data/gui/accounts_window.ui.h:31 msgid "" "If checked, Gajim will send keep-alive packets to prevent connection timeout " "which results in disconnection" @@ -328,7 +342,7 @@ "Si coché, Gajim enverra des paquets de maintien de connection pour prévenir " "des temps de latence pouvant entraîner des déconnexions" -#: ../data/gui/accounts_window.ui.h:30 +#: ../data/gui/accounts_window.ui.h:32 msgid "" "If checked, Gajim, when launched, will automatically connect to jabber using " "this account" @@ -336,7 +350,7 @@ "Si cette case est cochée, au démarrage, Gajim se connectera automatiquement " "à jabber en utilisant ce compte" -#: ../data/gui/accounts_window.ui.h:31 +#: ../data/gui/accounts_window.ui.h:33 msgid "" "If checked, any change to the global status (handled by the combobox at the " "bottom of the roster window) will change the status of this account " @@ -346,7 +360,7 @@ "l'aide du bouton en bas de la fenêtre principale) sera répercutée sur l'état " "de ce compte" -#: ../data/gui/accounts_window.ui.h:32 +#: ../data/gui/accounts_window.ui.h:34 msgid "" "If the default port that is used for incoming messages is unfitting for your " "setup you can select another one here.\n" @@ -357,39 +371,39 @@ "Vous devriez considérer modifier les paramètres de votre pare-feu si vous en " "avez un." -#: ../data/gui/accounts_window.ui.h:34 +#: ../data/gui/accounts_window.ui.h:36 msgid "Information about you, as stored in the server" msgstr "Les informations vous concernant, stockées sur le serveur" -#: ../data/gui/accounts_window.ui.h:35 -#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1826 +#: ../data/gui/accounts_window.ui.h:37 +#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1869 #: ../src/dialogs.py:837 msgid "Jabber ID:" msgstr "Identifiant Jabber :" -#: ../data/gui/accounts_window.ui.h:36 +#: ../data/gui/accounts_window.ui.h:38 #: ../data/gui/zeroconf_information_window.ui.h:5 msgid "Last Name:" msgstr "Nom :" -#: ../data/gui/accounts_window.ui.h:37 +#: ../data/gui/accounts_window.ui.h:39 msgid "Mer_ge accounts" msgstr "_Regrouper les comptes"

1 0

gajim: fix string
by Yann Leboulanger 18 Mar '12

18 Mar '12

changeset 264a19cacb3a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=264a19cacb3a description: fix string diffstat: src/common/config.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 04fb31f97e70 -r 264a19cacb3a src/common/config.py --- a/src/common/config.py Sat Mar 17 23:02:27 2012 +0000 +++ b/src/common/config.py Sun Mar 18 12:17:55 2012 +0100 @@ -456,7 +456,7 @@ 'speller_language': [ opt_str, '', _('Language for which we want to check misspelled words')], }, {}), 'plugins': ({ - 'active': [opt_bool, False, _('State whether plugins should be activated on exit (this is saved on Gajim exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI instead.')], + 'active': [opt_bool, False, _('State whether plugins should be activated on startup (this is saved on Gajim exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI instead.')], },{}), }

1 0

gajim: fix anonymous login when server has a SSL error. Fixes #7121
by Yann Leboulanger 18 Mar '12

18 Mar '12

changeset 68855f4fa5f6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=68855f4fa5f6 description: fix anonymous login when server has a SSL error. Fixes #7121 diffstat: src/common/connection.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r 9a121ea3d010 -r 68855f4fa5f6 src/common/connection.py --- a/src/common/connection.py Wed Mar 14 23:49:37 2012 -0400 +++ b/src/common/connection.py Fri Mar 16 23:09:00 2012 +0100 @@ -1344,7 +1344,10 @@ msg=_('Connection with account %s has been lost. Retry ' 'connecting.') % self.name)) return - name = gajim.config.get_per('accounts', self.name, 'name') + if gajim.config.get_per('accounts', self.name, 'anonymous_auth'): + name = None + else: + name = gajim.config.get_per('accounts', self.name, 'name') self._register_handlers(self.connection, 'ssl') self.connection.auth(name, self.password, self.server_resource, 1, self.__on_auth)

1 0

gajim: make sure SM is disabled with reconnecting
by Jefry Lagrange 18 Mar '12

18 Mar '12

changeset 9a121ea3d010 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9a121ea3d010 description: make sure SM is disabled with reconnecting diffstat: src/common/connection.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r fbed9bf7aea4 -r 9a121ea3d010 src/common/connection.py --- a/src/common/connection.py Wed Mar 14 23:37:32 2012 -0400 +++ b/src/common/connection.py Wed Mar 14 23:49:37 2012 -0400 @@ -822,6 +822,7 @@ gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, show='offline')) else: + self.sm.enabled = False gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, show='error')) self.disconnect()

1 0

gajim: handle data forms in groupchat messages. This way room ad...
by Yann Leboulanger 18 Mar '12

18 Mar '12

changeset 75094d353cc4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=75094d353cc4 description: handle data forms in groupchat messages. This way room admins can handle voice requests. diffstat: src/common/connection_handlers_events.py | 2 ++ src/gui_interface.py | 11 +++++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diffs (40 lines): diff -r f585536ea6d1 -r 75094d353cc4 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Tue Mar 13 14:42:52 2012 +0100 +++ b/src/common/connection_handlers_events.py Tue Mar 13 17:30:48 2012 +0100 @@ -1292,6 +1292,8 @@ if self.status_code != []: gajim.nec.push_incoming_event(GcConfigChangedReceivedEvent( None, conn=self.conn, msg_event=self)) + if self.msg_obj.form_node: + return True return self.displaymarking = None diff -r f585536ea6d1 -r 75094d353cc4 src/gui_interface.py --- a/src/gui_interface.py Tue Mar 13 14:42:52 2012 +0100 +++ b/src/gui_interface.py Tue Mar 13 17:30:48 2012 +0100 @@ -329,6 +329,16 @@ if gc_control and gc_control.autorejoin: gc_control.autorejoin = False + def handle_event_gc_message(self, obj): + if not obj.stanza.getTag('body'): # no <body> + # It could be a voice request. See + # http://www.xmpp.org/extensions/xep-0045.html#voiceapprove + if obj.msg_obj.form_node: + dialogs.SingleMessageWindow(obj.conn.name, obj.fjid, + action='receive', from_whom=obj.fjid, + subject='', message='', resource='', session=None, + form_node=obj.msg_obj.form_node) + def handle_event_presence(self, obj): # 'NOTIFY' (account, (jid, status, status message, resource, # priority, # keyID, timestamp, contact_nickname)) @@ -1396,6 +1406,7 @@ 'fingerprint-error': [self.handle_event_fingerprint_error], 'gc-invitation-received': [self.handle_event_gc_invitation], 'gc-presence-received': [self.handle_event_gc_presence], + 'gc-message-received': [self.handle_event_gc_message], 'gmail-notify': [self.handle_event_gmail_notify], 'gpg-password-required': [self.handle_event_gpg_password_required], 'gpg-trust-key': [self.handle_event_gpg_trust_key],

1 0

gajim: [Matthew Wild] fix stream management error handling. Fixe...
by Jefry Lagrange 18 Mar '12

18 Mar '12

changeset fbed9bf7aea4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fbed9bf7aea4 description: [Matthew Wild] fix stream management error handling. Fixes #7091 diffstat: src/common/xmpp/smacks.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 75094d353cc4 -r fbed9bf7aea4 src/common/xmpp/smacks.py --- a/src/common/xmpp/smacks.py Tue Mar 13 17:30:48 2012 +0100 +++ b/src/common/xmpp/smacks.py Wed Mar 14 23:37:32 2012 -0400 @@ -114,6 +114,7 @@ # Ask for service discovery, etc.. if stanza.getTag('item-not-found'): self.resuming = False + self.enabled = False # we need to bind a resource self._owner.NonBlockingBind.resuming = False self._owner._on_auth_bind(None)

1 0

gajim: close jingle audio/video request window when we click ok/...
by Yann Leboulanger 18 Mar '12

18 Mar '12

changeset f585536ea6d1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f585536ea6d1 description: close jingle audio/video request window when we click ok/cancel button is seesion has been canceled. Fixes #7119 diffstat: src/dialogs.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r e85378e7a9ef -r f585536ea6d1 src/dialogs.py --- a/src/dialogs.py Tue Mar 13 14:32:09 2012 +0100 +++ b/src/dialogs.py Tue Mar 13 14:42:52 2012 +0100 @@ -5158,6 +5158,7 @@ session = gajim.connections[self.account].get_jingle_session(self.fjid, self.sid) if not session: + dialog.destroy() return if response == gtk.RESPONSE_YES: #TODO: Ensure that ctrl.contact.resource == resource

1 0

gajim: [leon] show account name in tooltip rather than in roster...
by Yann Leboulanger 18 Mar '12

18 Mar '12

changeset e85378e7a9ef in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e85378e7a9ef description: [leon] show account name in tooltip rather than in roster in merged mode. Fixes #7118 diffstat: src/roster_window.py | 23 ----------------------- src/tooltips.py | 5 +++++ 2 files changed, 5 insertions(+), 23 deletions(-) diffs (48 lines): diff -r 5295fadc4308 -r e85378e7a9ef src/roster_window.py --- a/src/roster_window.py Sun Mar 11 19:38:44 2012 +0100 +++ b/src/roster_window.py Tue Mar 13 14:32:09 2012 +0100 @@ -1163,29 +1163,6 @@ name += i18n.paragraph_direction_mark(unicode(name)) name += u' (%d)' % nb_connected_contact - # show (account_name) if there are 2 contact with same jid - # in merged mode - if self.regroup: - add_acct = False - # look through all contacts of all accounts - for account_ in gajim.connections: - # useless to add account name - if account_ == account: - continue - for jid_ in gajim.contacts.get_jid_list(account_): - contact_ = gajim.contacts.get_first_contact_from_jid( - account_, jid_) - if contact_.get_shown_name() == contact.get_shown_name() \ - and (jid_, account_) != (jid, account): - add_acct = True - break - if add_acct: - # No need to continue in other account - # if we already found one - break - if add_acct: - name += ' (' + account + ')' - # add status msg, if not empty, under contact name in # the treeview if contact.status and gajim.config.get('show_status_msgs_in_roster'): diff -r 5295fadc4308 -r e85378e7a9ef src/tooltips.py --- a/src/tooltips.py Sun Mar 11 19:38:44 2012 +0100 +++ b/src/tooltips.py Tue Mar 13 14:32:09 2012 +0100 @@ -498,6 +498,11 @@ name_markup = u'<span weight="bold">' + \ gobject.markup_escape_text(prim_contact.get_shown_name())\ + '</span>' + if gajim.config.get('mergeaccounts'): + name_markup += u" <span foreground='#888A85'>(" + \ + gobject.markup_escape_text(prim_contact.account.name) \ + + ')</span>' + if self.account and helpers.jid_is_blocked(self.account, prim_contact.jid): name_markup += _(' [blocked]')

1 0

gajim: update ipyton_view for ipython 0.12
by Yann Leboulanger 17 Mar '12

17 Mar '12

changeset dfd2481bd433 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=dfd2481bd433 description: update ipyton_view for ipython 0.12 diffstat: src/ipython_view.py | 174 ++++++++++++++++++++++++++++++++++----------------- 1 files changed, 116 insertions(+), 58 deletions(-) diffs (245 lines): diff -r f23bcb7fde59 -r dfd2481bd433 src/ipython_view.py --- a/src/ipython_view.py Fri Mar 16 23:09:00 2012 +0100 +++ b/src/ipython_view.py Sat Mar 17 19:28:48 2012 +0100 @@ -51,12 +51,6 @@ try: import IPython - import IPython.iplib - import IPython.prefilter - import IPython.Shell - import IPython.genutils - import IPython.shadowns - import IPython.history except ImportError: IPython = None @@ -96,33 +90,52 @@ @type input_func: function """ if input_func: - IPython.iplib.raw_input_original = input_func + IPython.frontend.terminal.interactiveshell.raw_input_original = input_func if cin: - IPython.Shell.Term.cin = cin + IPython.utils.io.stdin = IPython.utils.io.IOStream(cin) if cout: - IPython.Shell.Term.cout = cout + IPython.utils.io.stdout = IPython.utils.io.IOStream(cout) if cerr: - IPython.Shell.Term.cerr = cerr + IPython.utils.io.stderr = IPython.utils.io.IOStream(cerr) # This is to get rid of the blockage that accurs during # IPython.Shell.InteractiveShell.user_setup() - IPython.iplib.raw_input = lambda x: None + IPython.utils.io.raw_input = lambda x: None - self.term = IPython.genutils.IOTerm(cin=cin, cout=cout, cerr=cerr) + self.term = IPython.utils.io.IOTerm(stdin=cin, stdout=cout, stderr=cerr) os.environ['TERM'] = 'dumb' excepthook = sys.excepthook - self.IP = IPython.Shell.make_IPython( - argv, user_ns=user_ns, - user_global_ns=user_global_ns, - embedded=True, - shell_class=IPython.Shell.InteractiveShell) + + from IPython.config.loader import Config + cfg = Config() + cfg.InteractiveShell.colors = "Linux" + + self.IP = IPython.frontend.terminal.embed.InteractiveShellEmbed(config=cfg, user_ns=user_ns) self.IP.system = lambda cmd: self.shell(self.IP.var_expand(cmd), header='IPython system call: ', - verbose=self.IP.rc.system_verbose) + local_ns=user_ns) + #global_ns=user_global_ns) + #verbose=self.IP.rc.system_verbose) + + self.IP.raw_input = input_func sys.excepthook = excepthook self.iter_more = 0 self.history_level = 0 self.complete_sep = re.compile('[\s\{\}\[\]\(\)]') + self.updateNamespace({'exit':lambda:None}) + self.updateNamespace({'quit':lambda:None}) + self.IP.readline_startup_hook(self.IP.pre_readline) + # Workaround for updating namespace with sys.modules + # + self.__update_namespace() + + def __update_namespace(self): + ''' + Update self.IP namespace for autocompletion with sys.modules + ''' + for k,v in sys.modules.items(): + if not '.' in k: + self.IP.user_ns.update({k:v}) def execute(self): """ @@ -130,34 +143,69 @@ """ self.history_level = 0 orig_stdout = sys.stdout - sys.stdout = IPython.Shell.Term.cout + sys.stdout = self.term.stdout + + orig_stdin = sys.stdin + sys.stdin = IPython.utils.io.stdin; + self.prompt = self.generatePrompt(self.iter_more) + + self.IP.hooks.pre_prompt_hook() + if self.iter_more: + try: + self.prompt = self.generatePrompt(True) + except: + self.IP.showtraceback() + if self.IP.autoindent: + self.IP.rl_do_indent = True + try: - line = self.IP.raw_input(None, self.iter_more) - if self.IP.autoindent: - self.IP.readline_startup_hook(None) + line = self.IP.raw_input(self.prompt) except KeyboardInterrupt: self.IP.write('\nKeyboardInterrupt\n') - self.IP.resetbuffer() - # keep cache in sync with the prompt counter: - self.IP.outputcache.prompt_count -= 1 - - if self.IP.autoindent: - self.IP.indent_current_nsp = 0 - self.iter_more = 0 + self.IP.input_splitter.reset() except: self.IP.showtraceback() else: - self.iter_more = self.IP.push(line) + self.IP.input_splitter.push(line) + self.iter_more = self.IP.input_splitter.push_accepts_more() + self.prompt = self.generatePrompt(self.iter_more) if (self.IP.SyntaxTB.last_syntax_error and - self.IP.rc.autoedit_syntax): + self.IP.autoedit_syntax): self.IP.edit_syntax_error() - if self.iter_more: - self.prompt = str(self.IP.outputcache.prompt2).strip() - if self.IP.autoindent: - self.IP.readline_startup_hook(self.IP.pre_readline) + if not self.iter_more: + source_raw = self.IP.input_splitter.source_raw_reset()[1] + self.IP.run_cell(source_raw, store_history=True) + else: + # TODO: Auto-indent + # + pass + + sys.stdout = orig_stdout + sys.stdin = orig_stdin + def generatePrompt(self, is_continuation): + ''' + Generate prompt depending on is_continuation value + + @param is_continuation + @type is_continuation: boolean + + @return: The prompt string representation + @rtype: string + + ''' + + # Backwards compatibility with ipyton-0.11 + # + ver = IPython.__version__ + if '0.11' in ver: + prompt = self.IP.hooks.generate_prompt(is_continuation) else: - self.prompt = str(self.IP.outputcache.prompt1).strip() - sys.stdout = orig_stdout + if is_continuation: + prompt = self.IP.prompt_manager.render('in2') + else: + prompt = self.IP.prompt_manager.render('in') + + return prompt def historyBack(self): """ @@ -214,28 +262,37 @@ @rtype: tuple """ split_line = self.complete_sep.split(line) - possibilities = self.IP.complete(split_line[-1]) - - try: - __builtins__.all() - except AttributeError: - def all(iterable): - for element in iterable: - if not element: - return False - return True - - def common_prefix(seq): - """ - Return the common prefix of a sequence of strings - """ - return "".join(c for i, c in enumerate(seq[0]) - if all(s.startswith(c, i) for s in seq)) - if possibilities: - completed = line[:-len(split_line[-1])]+common_prefix(possibilities) + if split_line[-1]: + possibilities = self.IP.complete(split_line[-1]) else: completed = line - return completed, possibilities + possibilities = ['',[]] + if possibilities: + def _commonPrefix(str1, str2): + ''' + Reduction function. returns common prefix of two given strings. + + @param str1: First string. + @type str1: string + @param str2: Second string + @type str2: string + + @return: Common prefix to both strings. + @rtype: string + ''' + for i in range(len(str1)): + if not str2.startswith(str1[:i+1]): + return str1[:i] + return str1 + + if possibilities[1]: + common_prefix = reduce(_commonPrefix, possibilities[1]) or line[-1] + completed = line[:-len(split_line[-1])]+common_prefix + else: + completed = line + else: + completed = line + return completed, possibilities[1] def shell(self, cmd,verbose=0,debug=0,header=''): @@ -332,7 +389,7 @@ for tag in ansi_tags: i = segments.index(tag) self.text_buffer.insert_with_tags_by_name(self.text_buffer.get_end_iter(), - segments[i+1], tag) + segments[i+1], str(tag)) segments.pop(i) if not editable: self.text_buffer.apply_tag_by_name('notouch', @@ -472,6 +529,7 @@ input_func=self.raw_input) # self.connect('key_press_event', self.keyPress) self.execute() + self.prompt = self.generatePrompt(False) self.cout.truncate(0) self.showPrompt(self.prompt) self.interrupt = False

1 0

gajim: fix anonymous login when server has a SSL error. Fixes #7121
by Yann Leboulanger 16 Mar '12

16 Mar '12

changeset f23bcb7fde59 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f23bcb7fde59 description: fix anonymous login when server has a SSL error. Fixes #7121 diffstat: src/common/connection.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r c45f01083b60 -r f23bcb7fde59 src/common/connection.py --- a/src/common/connection.py Wed Mar 14 23:49:37 2012 -0400 +++ b/src/common/connection.py Fri Mar 16 23:09:00 2012 +0100 @@ -1333,7 +1333,10 @@ msg=_('Connection with account %s has been lost. Retry ' 'connecting.') % self.name)) return - name = gajim.config.get_per('accounts', self.name, 'name') + if gajim.config.get_per('accounts', self.name, 'anonymous_auth'): + name = None + else: + name = gajim.config.get_per('accounts', self.name, 'name') self._register_handlers(self.connection, 'ssl') self.connection.auth(name, self.password, self.server_resource, 1, self.__on_auth)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits