Commits February 2010

commits@gajim.org

4 participants
103 discussions

gajim: add adjustment to spinbutton in length notifier plugin
by Yann Leboulanger 12 Feb '10

12 Feb '10

changeset 76cf197892e5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=76cf197892e5 description: add adjustment to spinbutton in length notifier plugin diffstat: plugins/length_notifier/length_notifier.py | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diffs (24 lines): diff -r f2def8625d2b -r 76cf197892e5 plugins/length_notifier/length_notifier.py --- a/plugins/length_notifier/length_notifier.py Mon Feb 08 22:25:41 2010 +0100 +++ b/plugins/length_notifier/length_notifier.py Fri Feb 12 09:14:47 2010 +0100 @@ -123,15 +123,17 @@ ['length_notifier_config_table']) self.config_table = self.xml.get_object('length_notifier_config_table') self.child.pack_start(self.config_table) - + self.message_length_spinbutton = self.xml.get_object( 'message_length_spinbutton') + self.message_length_spinbutton.get_adjustment().set_all(140, 0, 500, 1, + 10, 0) self.notification_colorbutton = self.xml.get_object( 'notification_colorbutton') self.jids_entry = self.xml.get_object('jids_entry') - + self.xml.connect_signals(self) - + def on_run(self): self.message_length_spinbutton.set_value(self.plugin.config['MESSAGE_WARNING_LENGTH']) self.notification_colorbutton.set_color(gtk.gdk.color_parse(self.plugin.config['WARNING_COLOR']))

1 0

gajim: [Mattj] Fix connection to facebook server that don't unde...
by Yann Leboulanger 11 Feb '10

11 Feb '10

changeset 31cb58641c1d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=31cb58641c1d description: [Mattj] Fix connection to facebook server that don't understand ver="" in roster query. Fixes #5600 diffstat: src/common/connection_handlers.py | 7 ++++++- src/common/xmpp/protocol.py | 1 + src/common/xmpp/roster_nb.py | 5 +++-- 3 files changed, 10 insertions(+), 3 deletions(-) diffs (52 lines): diff -r 4309bc69cb37 -r 31cb58641c1d src/common/connection_handlers.py --- a/src/common/connection_handlers.py Thu Feb 11 18:50:56 2010 +0100 +++ b/src/common/connection_handlers.py Thu Feb 11 18:57:39 2010 +0100 @@ -636,9 +636,14 @@ else: if iq_obj.getErrorCode() not in ('403', '406', '404'): self.private_storage_supported = False + # We can now continue connection by requesting the roster - version = gajim.config.get_per('accounts', self.name, + version = None + if con.Stream.features.getTag('ver', + namespace=common.xmpp.NS_ROSTER_VER): + version = gajim.config.get_per('accounts', self.name, 'roster_version') + iq_id = self.connection.initRoster(version=version) self.awaiting_answers[iq_id] = (ROSTER_ARRIVED, ) elif self.awaiting_answers[id_][0] == ROSTER_ARRIVED: diff -r 4309bc69cb37 -r 31cb58641c1d src/common/xmpp/protocol.py --- a/src/common/xmpp/protocol.py Thu Feb 11 18:50:56 2010 +0100 +++ b/src/common/xmpp/protocol.py Thu Feb 11 18:57:39 2010 +0100 @@ -96,6 +96,7 @@ NS_REGISTER ='jabber:iq:register' NS_ROSTER ='jabber:iq:roster' NS_ROSTERX ='http://jabber.org/protocol/rosterx' # XEP-0144 +NS_ROSTER_VER ='urn:xmpp:features:rosterver' # XEP-0273 NS_RPC ='jabber:iq:rpc' # XEP-0009 NS_SASL ='urn:ietf:params:xml:ns:xmpp-sasl' NS_SEARCH ='jabber:iq:search' diff -r 4309bc69cb37 -r 31cb58641c1d src/common/xmpp/roster_nb.py --- a/src/common/xmpp/roster_nb.py Thu Feb 11 18:50:56 2010 +0100 +++ b/src/common/xmpp/roster_nb.py Thu Feb 11 18:57:39 2010 +0100 @@ -38,7 +38,7 @@ internal representation of contacts in roster """ - def __init__(self, version=''): + def __init__(self, version=None): """ Init internal variables """ @@ -60,7 +60,8 @@ return iq = Iq('get', NS_ROSTER) - iq.setTagAttr('query', 'ver', self.version) + if self.version is not None: + iq.setTagAttr('query', 'ver', self.version) id_ = self._owner.getAnID() iq.setID(id_) self._owner.send(iq)

1 0

gajim: fix adding a new contact. Fixes #5602
by Yann Leboulanger 11 Feb '10

11 Feb '10

changeset 4309bc69cb37 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4309bc69cb37 description: fix adding a new contact. Fixes #5602 diffstat: src/common/helpers.py | 1 + src/dialogs.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diffs (20 lines): diff -r 1fffd510e924 -r 4309bc69cb37 src/common/helpers.py --- a/src/common/helpers.py Thu Feb 11 10:24:39 2010 +0100 +++ b/src/common/helpers.py Thu Feb 11 18:50:56 2010 +0100 @@ -1353,3 +1353,4 @@ elif nick: name = nick s = Template(s).safe_substitute({'name': name}) + return s diff -r 1fffd510e924 -r 4309bc69cb37 src/dialogs.py --- a/src/dialogs.py Thu Feb 11 10:24:39 2010 +0100 +++ b/src/dialogs.py Thu Feb 11 18:50:56 2010 +0100 @@ -992,7 +992,7 @@ if self.account: message_buffer = self.message_textview.get_buffer() message_buffer.set_text(helpers.get_subscription_request_msg( - self.account)) + self.account)) def on_add_new_contact_window_destroy(self, widget): if self.account:

1 0

gajim: build regex pattern correctly. Fixes #5596
by Yann Leboulanger 11 Feb '10

11 Feb '10

changeset 1fffd510e924 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1fffd510e924 description: build regex pattern correctly. Fixes #5596 diffstat: src/gui_interface.py | 24 ++++++++---------------- 1 files changed, 8 insertions(+), 16 deletions(-) diffs (49 lines): diff -r f9e51e9072a2 -r 1fffd510e924 src/gui_interface.py --- a/src/gui_interface.py Wed Feb 10 19:24:11 2010 +0100 +++ b/src/gui_interface.py Thu Feb 11 10:24:39 2010 +0100 @@ -2311,37 +2311,29 @@ @property def basic_pattern_re(self): - try: - return self._basic_pattern_re - except AttributeError: + if not self._basic_pattern_re: self._basic_pattern_re = re.compile(self.basic_pattern, re.IGNORECASE) - return self._basic_pattern_re + return self._basic_pattern_re @property def emot_and_basic_re(self): - try: - return self._emot_and_basic_re - except AttributeError: + if not self._emot_and_basic_re: self._emot_and_basic_re = re.compile(self.emot_and_basic, re.IGNORECASE + re.UNICODE) - return self._emot_and_basic_re + return self._emot_and_basic_re @property def sth_at_sth_dot_sth_re(self): - try: - return self._sth_at_sth_dot_sth_re - except AttributeError: + if not self._sth_at_sth_dot_sth_re: self._sth_at_sth_dot_sth_re = re.compile(self.sth_at_sth_dot_sth) - return self._sth_at_sth_dot_sth_re + return self._sth_at_sth_dot_sth_re @property def invalid_XML_chars_re(self): - try: - return self._invalid_XML_chars_re - except AttributeError: + if not self._invalid_XML_chars_re: self._invalid_XML_chars_re = re.compile(self.invalid_XML_chars) - return self._invalid_XML_chars_re + return self._invalid_XML_chars_re def make_regexps(self): # regexp meta characters are: . ^ $ * + ? { } [ ] \ | ( )

1 0

gajim: convert tabs to spaces in source code thanks to reindent.py
by Éric Araujo 10 Feb '10

10 Feb '10

changeset 0d440eb6cb90 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0d440eb6cb90 description: convert tabs to spaces in source code thanks to reindent.py also use 2to3 -f ws_comma to fix some whitespace diffstat: data/emoticons/animated/emoticons.py | 96 +- data/emoticons/static-big/emoticons.py | 82 +- data/emoticons/static/emoticons.py | 82 +- data/emoticons/tango/emoticons.py | 2 +- scripts/dev/run-build-test.py | 15 +- scripts/dev/run-pylint.py | 4 +- setup_win32.py | 43 +- src/adhoc_commands.py | 848 +- src/advanced_configuration_window.py | 434 +- src/atom_window.py | 190 +- src/cell_renderer_image.py | 194 +- src/chat_control.py | 4804 +++--- src/common/GnuPG.py | 360 +- src/common/GnuPGInterface.py | 2 - src/common/__init__.py | 2 - src/common/account.py | 22 +- src/common/atom.py | 192 +- src/common/caps.py | 666 +- src/common/check_paths.py | 234 +- src/common/commands.py | 646 +- src/common/config.py | 1258 +- src/common/configpaths.py | 174 +- src/common/connection.py | 3768 ++-- src/common/connection_handlers.py | 5168 ++++---- src/common/contacts.py | 1370 +- src/common/crypto.py | 88 +- src/common/dataforms.py | 842 +- src/common/dbus_support.py | 222 +- src/common/defs.py | 4 +- src/common/dh.py | 50 +- src/common/events.py | 488 +- src/common/exceptions.py | 100 +- src/common/fuzzyclock.py | 56 +- src/common/gajim.py | 386 +- src/common/helpers.py | 2038 +- src/common/i18n.py | 92 +- src/common/idle.py | 110 +- src/common/jingle.py | 164 +- src/common/jingle_content.py | 156 +- src/common/jingle_rtp.py | 484 +- src/common/jingle_session.py | 1015 +- src/common/jingle_transport.py | 185 +- src/common/kwalletbinding.py | 78 +- src/common/latex.py | 172 +- src/common/logger.py | 1768 +- src/common/logging_helpers.py | 252 +- src/common/message_archiving.py | 386 +- src/common/optparser.py | 1474 +- src/common/passwords.py | 324 +- src/common/pep.py | 990 +- src/common/proxy65_manager.py | 720 +- src/common/pubsub.py | 274 +- src/common/resolver.py | 508 +- src/common/rst_xhtml_generator.py | 224 +- src/common/sleepy.py | 164 +- src/common/socks5.py | 1942 +- src/common/stanza_session.py | 1682 +- src/common/xmpp/__init__.py | 2 - src/common/xmpp/auth_nb.py | 886 +- src/common/xmpp/bosh.py | 844 +- src/common/xmpp/c14n.py | 56 +- src/common/xmpp/client_nb.py | 936 +- src/common/xmpp/dispatcher_nb.py | 974 +- src/common/xmpp/features_nb.py | 282 +- src/common/xmpp/idlequeue.py | 828 +- src/common/xmpp/plugin.py | 130 +- src/common/xmpp/protocol.py | 1328 +- src/common/xmpp/proxy_connectors.py | 386 +- src/common/xmpp/roster_nb.py | 436 +- src/common/xmpp/simplexml.py | 856 +- src/common/xmpp/stringprepare.py | 252 +- src/common/xmpp/tls_nb.py | 650 +- src/common/xmpp/transports_nb.py | 1192 +- src/common/zeroconf/__init__.py | 2 - src/common/zeroconf/client_zeroconf.py | 1322 +- src/common/zeroconf/connection_handlers_zeroconf.py | 248 +- src/common/zeroconf/connection_zeroconf.py | 556 +- src/common/zeroconf/roster_zeroconf.py | 228 +- src/common/zeroconf/zeroconf.py | 36 +- src/common/zeroconf/zeroconf_avahi.py | 734 +- src/common/zeroconf/zeroconf_bonjour.py | 484 +- src/config.py | 7636 ++++++------ src/conversation_textview.py | 2274 +- src/dataforms_widget.py | 972 +- src/dialogs.py | 9888 +++++++------- src/disco.py | 3794 +++--- src/features_window.py | 404 +- src/filetransfers_window.py | 1722 +- src/gajim-remote.py | 1020 +- src/gajim.py | 530 +- src/gajim_themes_window.py | 676 +- src/groupchat_control.py | 4198 +++--- src/groups.py | 78 +- src/gtkexcepthook.py | 114 +- src/gtkgui_helpers.py | 1698 +- src/gtkspell.py | 1 - src/gui_interface.py | 6804 +++++----- src/gui_menu_builder.py | 798 +- src/history_manager.py | 1002 +- src/history_window.py | 992 +- src/htmltextview.py | 1656 +- src/ipython_view.py | 926 +- src/message_control.py | 272 +- src/message_textview.py | 474 +- src/message_window.py | 2012 +- src/music_track_listener.py | 478 +- src/negotiation.py | 84 +- src/network_manager_listener.py | 106 +- src/notify.py | 1138 +- src/profile_window.py | 588 +- src/remote_control.py | 1162 +- src/roster_window.py | 11374 ++++++++--------- src/search_window.py | 350 +- src/secrets.py | 122 +- src/session.py | 806 +- src/statusicon.py | 646 +- src/tooltips.py | 1172 +- src/vcard.py | 918 +- test/integration/__init__.py | 2 +- test/integration/test_gui_event_integration.py | 234 +- test/integration/test_resolver.py | 142 +- test/integration/test_roster.py | 282 +- test/integration/test_xmpp_client_nb.py | 240 +- test/integration/test_xmpp_transports_nb.py | 440 +- test/lib/__init__.py | 40 +- test/lib/data.py | 124 +- test/lib/gajim_mocks.py | 194 +- test/lib/mock.py | 10 +- test/lib/notify.py | 10 +- test/lib/xmpp_mocks.py | 136 +- test/runtests.py | 70 +- test/unit/__init__.py | 2 +- test/unit/test_account.py | 14 +- test/unit/test_caps.py | 240 +- test/unit/test_contacts.py | 212 +- test/unit/test_gui_interface.py | 170 +- test/unit/test_sessions.py | 270 +- test/unit/test_xmpp_dispatcher_nb.py | 140 +- test/unit/test_xmpp_transports_nb.py | 124 +- 139 files changed, 61737 insertions(+), 61986 deletions(-) diffs (truncated from 131961 to 300 lines): diff -r 79d247a7e6ef -r 0d440eb6cb90 data/emoticons/animated/emoticons.py --- a/data/emoticons/animated/emoticons.py Thu Dec 10 17:40:48 2009 +0100 +++ b/data/emoticons/animated/emoticons.py Wed Feb 10 17:59:17 2010 +0100 @@ -1,52 +1,50 @@ # coding=utf-8 emoticons = { - 'smile.png': [':-)', ':)'], - 'coolglasses.png': ['B-)', '(H)'], - 'wink.gif': [';-)', ';)'], - 'biggrin.png': [':-D', ':D'], - 'unhappy.png': [':-(', ':('], - 'cry.gif': [":'-(", ":'(", ';-(', ';(', ";'-("], - 'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'], - 'blush.png': [':-$', ':$'], - 'angry.png': [':-@', ':@'], - 'bat.gif': [':-[', ':['], - 'kiss.png': [':-{}', ':-*', ':*', '(K)'], - 'stare.png': [':-|', ':|'], - 'devil.png': [']:->', '>:-)', '>:)', '(6)'], - 'tongue.png': [':-P', ':P', ':-þ', ':þ'], - 'oh.png': ['=-O', ':-O', ':O'], - 'heart.png': ['<3', '(L)', '*IN LOVE*'], - 'pussy.png': ['(@)'], - 'cuffs.png': ['(%)'], - 'moon.png': ['(S)'], - 'lamp.png': ['(I)'], - 'music.png': ['(8)'], - 'beer.png': ['(B)', '*DRINK*'], - 'brflower.png': ['(W)'], - 'boy.png': ['(Z)'], - 'girl.png': ['(X)'], - 'mail.png': ['(E)'], - 'thumbdown.png': ['(N)'], - 'photo.png': ['(P)'], - 'thumbup.png': ['(Y)', '*THUMBS UP*'], - 'hugleft.png': ['(})'], - 'brheart.png': ['</3', '(U)'], - 'flower.png': ['@}->--', '(F)'], - 'drink.png': ['(D)'], - 'phone.png': ['(T)'], - 'coffee.png': ['(C)'], - 'hugright.png': ['({)'], - 'star.png': ['(*)'], - 'rainbow.png': ['(R)'], - 'cigarette.gif': ['(ci)'], - 'cake.gif': ['(^)'], - 'dontknow.gif': [':^)'], - 'eyeroll.gif': ['8-)'], - 'lightning.gif': ['(li)'], - 'party.gif': ['<:o)'], - 'sleepy.gif': ['|-)'], - 'think.gif': ['*-)'], - 'puke.gif': [':-!'], + 'smile.png': [':-)', ':)'], + 'coolglasses.png': ['B-)', '(H)'], + 'wink.gif': [';-)', ';)'], + 'biggrin.png': [':-D', ':D'], + 'unhappy.png': [':-(', ':('], + 'cry.gif': [":'-(", ":'(", ';-(', ';(', ";'-("], + 'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'], + 'blush.png': [':-$', ':$'], + 'angry.png': [':-@', ':@'], + 'bat.gif': [':-[', ':['], + 'kiss.png': [':-{}', ':-*', ':*', '(K)'], + 'stare.png': [':-|', ':|'], + 'devil.png': [']:->', '>:-)', '>:)', '(6)'], + 'tongue.png': [':-P', ':P', ':-þ', ':þ'], + 'oh.png': ['=-O', ':-O', ':O'], + 'heart.png': ['<3', '(L)', '*IN LOVE*'], + 'pussy.png': ['(@)'], + 'cuffs.png': ['(%)'], + 'moon.png': ['(S)'], + 'lamp.png': ['(I)'], + 'music.png': ['(8)'], + 'beer.png': ['(B)', '*DRINK*'], + 'brflower.png': ['(W)'], + 'boy.png': ['(Z)'], + 'girl.png': ['(X)'], + 'mail.png': ['(E)'], + 'thumbdown.png': ['(N)'], + 'photo.png': ['(P)'], + 'thumbup.png': ['(Y)', '*THUMBS UP*'], + 'hugleft.png': ['(})'], + 'brheart.png': ['</3', '(U)'], + 'flower.png': ['@}->--', '(F)'], + 'drink.png': ['(D)'], + 'phone.png': ['(T)'], + 'coffee.png': ['(C)'], + 'hugright.png': ['({)'], + 'star.png': ['(*)'], + 'rainbow.png': ['(R)'], + 'cigarette.gif': ['(ci)'], + 'cake.gif': ['(^)'], + 'dontknow.gif': [':^)'], + 'eyeroll.gif': ['8-)'], + 'lightning.gif': ['(li)'], + 'party.gif': ['<:o)'], + 'sleepy.gif': ['|-)'], + 'think.gif': ['*-)'], + 'puke.gif': [':-!'], } - -# vim: se ts=3: diff -r 79d247a7e6ef -r 0d440eb6cb90 data/emoticons/static-big/emoticons.py --- a/data/emoticons/static-big/emoticons.py Thu Dec 10 17:40:48 2009 +0100 +++ b/data/emoticons/static-big/emoticons.py Wed Feb 10 17:59:17 2010 +0100 @@ -1,45 +1,43 @@ # coding=utf-8 emoticons = { - 'smile.png': [':-)', ':)'], - 'coolglasses.png': ['8-)', 'B-)', '(H)'], - 'wink.png': [';-)', ';)'], - 'biggrin.png': [':-D', ':D'], - 'unhappy.png': [':-(', ':('], - 'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("], - 'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'], - 'blush.png': [':-$', ':$'], - 'angry.png': [':-@', ':@'], - 'bat.png': [':-[', ':['], - 'kiss.png': [':-{}', ':-*', ':*', '(K)'], - 'stare.png': [':-|', ':|'], - 'devil.png': [']:->', '>:-)', '>:)', '(6)'], - 'tongue.png': [':-P', ':P', ':-þ', ':þ'], - 'oh.png': ['=-O', ':-O', ':O'], - 'heart.png': ['<3', '(L)', '*IN LOVE*'], - 'lion.png': [':3', '>:3'], - 'pussy.png': ['(@)', '=^.^='], - 'cuffs.png': ['(%)'], - 'moon.png': ['(S)'], - 'lamp.png': ['(I)'], - 'music.png': ['(8)'], - 'beer.png': ['(B)', '*DRINK*'], - 'brflower.png': ['(W)'], - 'boy.png': ['(Z)'], - 'girl.png': ['(X)'], - 'mail.png': ['(E)'], - 'thumbdown.png': ['(N)'], - 'photo.png': ['(P)'], - 'thumbup.png': ['(Y)', '*THUMBS UP*'], - 'hugleft.png': ['(})'], - 'brheart.png': ['</3', '(U)'], - 'flower.png': ['@}->--', '(F)'], - 'drink.png': ['(D)'], - 'phone.png': ['(T)'], - 'coffee.png': ['(C)'], - 'hugright.png': ['({)'], - 'star.png': ['(*)'], - 'rainbow.png': ['(R)'], - 'puke.png': [':-!'], + 'smile.png': [':-)', ':)'], + 'coolglasses.png': ['8-)', 'B-)', '(H)'], + 'wink.png': [';-)', ';)'], + 'biggrin.png': [':-D', ':D'], + 'unhappy.png': [':-(', ':('], + 'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("], + 'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'], + 'blush.png': [':-$', ':$'], + 'angry.png': [':-@', ':@'], + 'bat.png': [':-[', ':['], + 'kiss.png': [':-{}', ':-*', ':*', '(K)'], + 'stare.png': [':-|', ':|'], + 'devil.png': [']:->', '>:-)', '>:)', '(6)'], + 'tongue.png': [':-P', ':P', ':-þ', ':þ'], + 'oh.png': ['=-O', ':-O', ':O'], + 'heart.png': ['<3', '(L)', '*IN LOVE*'], + 'lion.png': [':3', '>:3'], + 'pussy.png': ['(@)', '=^.^='], + 'cuffs.png': ['(%)'], + 'moon.png': ['(S)'], + 'lamp.png': ['(I)'], + 'music.png': ['(8)'], + 'beer.png': ['(B)', '*DRINK*'], + 'brflower.png': ['(W)'], + 'boy.png': ['(Z)'], + 'girl.png': ['(X)'], + 'mail.png': ['(E)'], + 'thumbdown.png': ['(N)'], + 'photo.png': ['(P)'], + 'thumbup.png': ['(Y)', '*THUMBS UP*'], + 'hugleft.png': ['(})'], + 'brheart.png': ['</3', '(U)'], + 'flower.png': ['@}->--', '(F)'], + 'drink.png': ['(D)'], + 'phone.png': ['(T)'], + 'coffee.png': ['(C)'], + 'hugright.png': ['({)'], + 'star.png': ['(*)'], + 'rainbow.png': ['(R)'], + 'puke.png': [':-!'], } - -# vim: se ts=3: diff -r 79d247a7e6ef -r 0d440eb6cb90 data/emoticons/static/emoticons.py --- a/data/emoticons/static/emoticons.py Thu Dec 10 17:40:48 2009 +0100 +++ b/data/emoticons/static/emoticons.py Wed Feb 10 17:59:17 2010 +0100 @@ -1,45 +1,43 @@ # coding=utf-8 emoticons = { - 'smile.png': [':-)', ':)'], - 'coolglasses.png': ['8-)', 'B-)', '(H)'], - 'wink.png': [';-)', ';)'], - 'biggrin.png': [':-D', ':D'], - 'unhappy.png': [':-(', ':('], - 'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("], - 'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'], - 'blush.png': [':-$', ':$'], - 'angry.png': [':-@', ':@'], - 'bat.png': [':-[', ':['], - 'kiss.png': [':-{}', ':-*', ':*', '(K)'], - 'stare.png': [':-|', ':|'], - 'devil.png': [']:->', '>:-)', '>:)', '(6)'], - 'tongue.png': [':-P', ':P', ':-þ', ':þ'], - 'oh.png': ['=-O', ':-O', ':O'], - 'heart.png': ['<3', '(L)', '*IN LOVE*'], - 'lion.png': [':3', '>:3'], - 'pussy.png': ['(@)', '=^.^='], - 'cuffs.png': ['(%)'], - 'moon.png': ['(S)'], - 'lamp.png': ['(I)'], - 'music.png': ['(8)'], - 'beer.png': ['(B)', '*DRINK*'], - 'brflower.png': ['(W)'], - 'boy.png': ['(Z)'], - 'girl.png': ['(X)'], - 'mail.png': ['(E)'], - 'thumbdown.png': ['(N)'], - 'photo.png': ['(P)'], - 'thumbup.png': ['(Y)', '*THUMBS UP*'], - 'hugleft.png': ['(})'], - 'brheart.png': ['</3', '(U)'], - 'flower.png': ['@}->--', '(F)'], - 'drink.png': ['(D)'], - 'phone.png': ['(T)'], - 'coffee.png': ['(C)'], - 'hugright.png': ['({)'], - 'star.png': ['(*)'], - 'rainbow.png': ['(R)'], - 'puke.png': [':-!'], + 'smile.png': [':-)', ':)'], + 'coolglasses.png': ['8-)', 'B-)', '(H)'], + 'wink.png': [';-)', ';)'], + 'biggrin.png': [':-D', ':D'], + 'unhappy.png': [':-(', ':('], + 'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("], + 'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'], + 'blush.png': [':-$', ':$'], + 'angry.png': [':-@', ':@'], + 'bat.png': [':-[', ':['], + 'kiss.png': [':-{}', ':-*', ':*', '(K)'], + 'stare.png': [':-|', ':|'], + 'devil.png': [']:->', '>:-)', '>:)', '(6)'], + 'tongue.png': [':-P', ':P', ':-þ', ':þ'], + 'oh.png': ['=-O', ':-O', ':O'], + 'heart.png': ['<3', '(L)', '*IN LOVE*'], + 'lion.png': [':3', '>:3'], + 'pussy.png': ['(@)', '=^.^='], + 'cuffs.png': ['(%)'], + 'moon.png': ['(S)'], + 'lamp.png': ['(I)'], + 'music.png': ['(8)'], + 'beer.png': ['(B)', '*DRINK*'], + 'brflower.png': ['(W)'], + 'boy.png': ['(Z)'], + 'girl.png': ['(X)'], + 'mail.png': ['(E)'], + 'thumbdown.png': ['(N)'], + 'photo.png': ['(P)'], + 'thumbup.png': ['(Y)', '*THUMBS UP*'], + 'hugleft.png': ['(})'], + 'brheart.png': ['</3', '(U)'], + 'flower.png': ['@}->--', '(F)'], + 'drink.png': ['(D)'], + 'phone.png': ['(T)'], + 'coffee.png': ['(C)'], + 'hugright.png': ['({)'], + 'star.png': ['(*)'], + 'rainbow.png': ['(R)'], + 'puke.png': [':-!'], } - -# vim: se ts=3: diff -r 79d247a7e6ef -r 0d440eb6cb90 data/emoticons/tango/emoticons.py --- a/data/emoticons/tango/emoticons.py Thu Dec 10 17:40:48 2009 +0100 +++ b/data/emoticons/tango/emoticons.py Wed Feb 10 17:59:17 2010 +0100 @@ -49,4 +49,4 @@ 'pissed-off.png': ['*WALL*'], 'mail.png': ['*WRITE*', '(E)'], 'tremble.png': ['*SCRATCH*'], -} \ No newline at end of file +} diff -r 79d247a7e6ef -r 0d440eb6cb90 scripts/dev/run-build-test.py --- a/scripts/dev/run-build-test.py Thu Dec 10 17:40:48 2009 +0100 +++ b/scripts/dev/run-build-test.py Wed Feb 10 17:59:17 2010 +0100 @@ -4,19 +4,16 @@ import sys if os.getcwd().endswith('dev'): - os.chdir('../../') # we were in scripts/dev + os.chdir('../../') # we were in scripts/dev

1 0

gajim: fixed some whitespace thanks to 2to3 -f ws_comma
by Éric Araujo 10 Feb '10

10 Feb '10

changeset f9e51e9072a2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f9e51e9072a2 description: fixed some whitespace thanks to 2to3 -f ws_comma diffstat: src/adhoc_commands.py | 8 +++--- src/advanced_configuration_window.py | 2 +- src/chat_control.py | 2 +- src/common/atom.py | 2 +- src/common/config.py | 16 ++++++------ src/common/connection.py | 12 ++++---- src/common/connection_handlers.py | 4 +- src/common/ged.py | 2 +- src/common/logging_helpers.py | 2 +- src/common/optparser.py | 2 +- src/common/resolver.py | 4 +- src/common/rst_xhtml_generator.py | 4 +- src/common/socks5.py | 6 ++-- src/common/stanza_session.py | 4 +- src/common/xmpp/auth_nb.py | 18 ++++++------ src/common/xmpp/bosh.py | 4 +- src/common/xmpp/client_nb.py | 6 ++-- src/common/xmpp/dispatcher_nb.py | 10 +++--- src/common/xmpp/features_nb.py | 30 +++++++++++----------- src/common/xmpp/idlequeue.py | 2 +- src/common/xmpp/plugin.py | 4 +- src/common/xmpp/protocol.py | 18 ++++++------ src/common/xmpp/proxy_connectors.py | 2 +- src/common/xmpp/roster_nb.py | 16 ++++++------ src/common/xmpp/simplexml.py | 38 ++++++++++++++-------------- src/common/xmpp/transports_nb.py | 4 +- src/common/zeroconf/zeroconf_avahi.py | 4 +- src/common/zeroconf/zeroconf_bonjour.py | 4 +- src/config.py | 6 ++-- src/conversation_textview.py | 2 +- src/dialogs.py | 2 +- src/filetransfers_window.py | 12 ++++---- src/gajim-remote.py | 14 +++++----- src/groupchat_control.py | 4 +- src/gui_interface.py | 10 +++--- src/history_window.py | 2 +- src/htmltextview.py | 28 ++++++++++---------- src/ipython_view.py | 6 ++-- src/network_manager_listener.py | 2 +- src/notify.py | 2 +- src/roster_window.py | 2 +- src/tooltips.py | 2 +- test/integration/test_xmpp_transports_nb.py | 2 +- test/lib/mock.py | 8 +++--- 44 files changed, 167 insertions(+), 167 deletions(-) diffs (truncated from 1426 to 300 lines): diff -r 35d52abee410 -r f9e51e9072a2 src/adhoc_commands.py --- a/src/adhoc_commands.py Wed Feb 10 16:17:09 2010 +0100 +++ b/src/adhoc_commands.py Wed Feb 10 19:24:11 2010 +0100 @@ -71,11 +71,11 @@ self.window.connect('delete-event', self.on_adhoc_commands_window_delete_event) for name in ('back_button', 'forward_button', - 'execute_button','close_button','stages_notebook', + 'execute_button', 'close_button', 'stages_notebook', 'retrieving_commands_stage_vbox', - 'command_list_stage_vbox','command_list_vbox', - 'sending_form_stage_vbox','sending_form_progressbar', - 'notes_label','no_commands_stage_vbox','error_stage_vbox', + 'command_list_stage_vbox', 'command_list_vbox', + 'sending_form_stage_vbox', 'sending_form_progressbar', + 'notes_label', 'no_commands_stage_vbox', 'error_stage_vbox', 'error_description_label'): self.__dict__[name] = self.xml.get_object(name) diff -r 35d52abee410 -r f9e51e9072a2 src/advanced_configuration_window.py --- a/src/advanced_configuration_window.py Wed Feb 10 16:17:09 2010 +0100 +++ b/src/advanced_configuration_window.py Wed Feb 10 19:24:11 2010 +0100 @@ -266,7 +266,7 @@ def visible_func(self, model, treeiter): search_string = self.entry.get_text().decode('utf-8').lower() - for it in tree_model_pre_order(model,treeiter): + for it in tree_model_pre_order(model, treeiter): if model[it][C_TYPE] != '': opt_path = self.get_option_path(model, it) if len(opt_path) == 3: diff -r 35d52abee410 -r f9e51e9072a2 src/chat_control.py --- a/src/chat_control.py Wed Feb 10 16:17:09 2010 +0100 +++ b/src/chat_control.py Wed Feb 10 19:24:11 2010 +0100 @@ -1053,7 +1053,7 @@ self.scroll_to_end_id = None return False - def size_request(self, msg_textview , requisition): + def size_request(self, msg_textview, requisition): """ When message_textview changes its size: if the new height will enlarge the window, enable the scrollbar automatic policy. Also enable scrollbar diff -r 35d52abee410 -r f9e51e9072a2 src/common/atom.py --- a/src/common/atom.py Wed Feb 10 16:17:09 2010 +0100 +++ b/src/common/atom.py Wed Feb 10 19:24:11 2010 +0100 @@ -117,7 +117,7 @@ Get source link """ try: - return self.getTag('feed').getTags('link',{'rel':'alternate'})[1].getData() + return self.getTag('feed').getTags('link', {'rel':'alternate'})[1].getData() except Exception: return None diff -r 35d52abee410 -r f9e51e9072a2 src/common/config.py --- a/src/common/config.py Wed Feb 10 16:17:09 2010 +0100 +++ b/src/common/config.py Wed Feb 10 19:24:11 2010 +0100 @@ -73,7 +73,7 @@ 'notify_on_new_message': [ opt_bool, True ], 'autopopupaway': [ opt_bool, False ], 'sounddnd': [ opt_bool, False, _('Play sound when user is busy')], - 'use_notif_daemon': [ opt_bool, True , _('Use D-Bus and Notification-Daemon to show notifications') ], + 'use_notif_daemon': [ opt_bool, True, _('Use D-Bus and Notification-Daemon to show notifications') ], 'showoffline': [ opt_bool, False ], 'show_only_chat_and_online': [ opt_bool, False, _('Show only online and free for chat contacts in roster.')], 'show_transports_group': [ opt_bool, True ], @@ -115,7 +115,7 @@ 'emoticons_theme': [opt_str, 'static', '', True ], 'ascii_formatting': [ opt_bool, True, _('Treat * / _ pairs as possible formatting characters.'), True], - 'show_ascii_formatting_chars': [ opt_bool, True , _('If True, do not ' + 'show_ascii_formatting_chars': [ opt_bool, True, _('If True, do not ' 'remove */_ . So *abc* will be bold but with * * not removed.')], 'rst_formatting_outgoing_messages': [ opt_bool, False, _('Uses ReStructured text markup to send HTML, plus ascii formatting if selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (If you want to use this, install docutils)')], @@ -268,7 +268,7 @@ 'max_conversation_lines': [opt_int, 500, _('Maximum number of lines that are printed in conversations. Oldest lines are cleared.')], 'attach_notifications_to_systray': [opt_bool, False, _('If True, notification windows from notification-daemon will be attached to systray icon.')], 'check_idle_every_foo_seconds': [opt_int, 2, _('Choose interval between 2 checks of idleness.')], - 'latex_png_dpi': [opt_str, '108',_('Change the value to change the size of latex formulas displayed. The higher is larger.') ], + 'latex_png_dpi': [opt_str, '108', _('Change the value to change the size of latex formulas displayed. The higher is larger.') ], 'uri_schemes': [opt_str, 'aaa aaas acap cap cid crid data dav dict dns fax file ftp go gopher h323 http https icap im imap info ipp iris iris.beep iris.xpc iris.xpcs iris.lwz ldap mid modem msrp msrps mtqp mupdate news nfs nntp opaquelocktoken pop pres rtsp service shttp sip sips snmp soap.beep soap.beeps tag tel telnet tftp thismessage tip tv urn vemmi xmlrpc.beep xmlrpc.beeps z39.50r z39.50s about cvs daap ed2k feed fish git iax2 irc ircs ldaps magnet mms rsync ssh svn sftp smb webcal', _('Valid uri schemes. Only schemes in this list will be accepted as "real" uri. (mailto and xmpp are handled separately)'), True], 'ask_offline_status_on_connection': [ opt_bool, False, _('Ask offline status message to all offline contacts when connection to an accoutn is established. WARNING: This causes a lot of requests to be sent!') ], 'shell_like_completion': [ opt_bool, False, _('If True, completion in groupchats will be like a shell auto-completion')], @@ -342,7 +342,7 @@ 'msgwin-y-position': [opt_int, -1], # Default is to let the wm decide 'msgwin-width': [opt_int, 480], 'msgwin-height': [opt_int, 440], - 'listen_to_network_manager' : [opt_bool, True], + 'listen_to_network_manager': [opt_bool, True], 'is_zeroconf': [opt_bool, False], 'last_status': [opt_str, 'online'], 'last_status_msg': [opt_str, ''], @@ -350,9 +350,9 @@ 'zeroconf_last_name': [ opt_str, '', '', True ], 'zeroconf_jabber_id': [ opt_str, '', '', True ], 'zeroconf_email': [ opt_str, '', '', True ], - 'use_env_http_proxy' : [opt_bool, False], - 'answer_receipts' : [opt_bool, True, _('Answer to receipt requests')], - 'request_receipt' : [opt_bool, True, _('Sent receipt requests')], + 'use_env_http_proxy': [opt_bool, False], + 'answer_receipts': [opt_bool, True, _('Answer to receipt requests')], + 'request_receipt': [opt_bool, True, _('Sent receipt requests')], 'publish_tune': [opt_bool, False], 'publish_location': [opt_bool, False], 'subscribe_mood': [opt_bool, True], @@ -493,7 +493,7 @@ themes_default = { # sorted alphanum - _('default'): [ '', '', '', 'B', '', '','', 'I', '', '', '', '', '','', + _('default'): [ '', '', '', 'B', '', '', '', 'I', '', '', '', '', '', '', '', 'B' ], _('green'): [ '', '#94aa8c', '', 'B', '#0000ff', '#eff3e7', diff -r 35d52abee410 -r f9e51e9072a2 src/common/connection.py --- a/src/common/connection.py Wed Feb 10 16:17:09 2010 +0100 +++ b/src/common/connection.py Wed Feb 10 19:24:11 2010 +0100 @@ -1118,7 +1118,7 @@ msg = '>>>>>> ' if self._proxy['type']=='bosh': msg = '%s over BOSH %s' % (msg, self._proxy['bosh_uri']) - if self._proxy['type'] in ['http','socks5'] or self._proxy['bosh_useproxy']: + if self._proxy['type'] in ['http', 'socks5'] or self._proxy['bosh_useproxy']: msg = '%s over proxy %s:%s' % (msg, self._proxy['host'], self._proxy['port']) log.info(msg) @@ -1338,7 +1338,7 @@ if not common.xmpp.isResultNode(resp): self.dispatch('PING_ERROR', (pingTo)) return - timeDiff = round(timePong - timePing,2) + timeDiff = round(timePong - timePing, 2) self.dispatch('PING_REPLY', (pingTo, timeDiff)) if pingTo: timePing = time_time() @@ -2054,7 +2054,7 @@ def send_gc_subject(self, jid, subject): if not self.connection: return - msg_iq = common.xmpp.Message(jid,typ = 'groupchat', subject = subject) + msg_iq = common.xmpp.Message(jid, typ = 'groupchat', subject = subject) self.connection.send(msg_iq) def request_gc_config(self, room_jid): @@ -2178,8 +2178,8 @@ username = gajim.config.get_per('accounts', self.name, 'name') iq = common.xmpp.Iq(typ = 'set', to = hostname) q = iq.setTag(common.xmpp.NS_REGISTER + ' query') - q.setTagData('username',username) - q.setTagData('password',password) + q.setTagData('username', username) + q.setTagData('password', password) self.connection.send(iq) def get_password(self, callback): @@ -2260,7 +2260,7 @@ item.addChild(node = form) else: for i in form.keys(): - item.setTagData(i,form[i]) + item.setTagData(i, form[i]) def _on_response(resp): jid = jid = helpers.get_jid_from_iq(resp) tag = resp.getTag('query', namespace = common.xmpp.NS_SEARCH) diff -r 35d52abee410 -r f9e51e9072a2 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed Feb 10 16:17:09 2010 +0100 +++ b/src/common/connection_handlers.py Wed Feb 10 19:24:11 2010 +0100 @@ -180,7 +180,7 @@ frm=to) iq.setAttr('id', id_) query = iq.setTag('query') - query.setAttr('node','http://gajim.org#' + gajim.version.split('-', 1)[0]) + query.setAttr('node', 'http://gajim.org#' + gajim.version.split('-', 1)[0]) for f in (common.xmpp.NS_BYTESTREAM, common.xmpp.NS_SI, common.xmpp.NS_FILE, common.xmpp.NS_COMMANDS): feature = common.xmpp.Node('feature') @@ -1634,7 +1634,7 @@ is_continued = False if invite.getTag('invite').getTag('continue'): is_continued = True - self.dispatch('GC_INVITATION',(frm, jid_from, reason, password, + self.dispatch('GC_INVITATION', (frm, jid_from, reason, password, is_continued)) def _presenceCB(self, con, prs): diff -r 35d52abee410 -r f9e51e9072a2 src/common/ged.py --- a/src/common/ged.py Wed Feb 10 16:17:09 2010 +0100 +++ b/src/common/ged.py Wed Feb 10 19:24:11 2010 +0100 @@ -40,7 +40,7 @@ if event_name in self.handlers: handlers_list = self.handlers[event_name] i = 0 - for i,h in enumerate(handlers_list): + for i, h in enumerate(handlers_list): if priority < h[0]: break diff -r 35d52abee410 -r f9e51e9072a2 src/common/logging_helpers.py --- a/src/common/logging_helpers.py Wed Feb 10 16:17:09 2010 +0100 +++ b/src/common/logging_helpers.py Wed Feb 10 19:24:11 2010 +0100 @@ -102,7 +102,7 @@ """ colors_mapping = { 'DEBUG': colors.BLUE, - 'INFO' : colors.GREEN, + 'INFO': colors.GREEN, 'WARNING': colors.BROWN, 'ERROR': colors.RED, 'CRITICAL': colors.BRIGHT_RED, diff -r 35d52abee410 -r f9e51e9072a2 src/common/optparser.py --- a/src/common/optparser.py Wed Feb 10 16:17:09 2010 +0100 +++ b/src/common/optparser.py Wed Feb 10 19:24:11 2010 +0100 @@ -706,7 +706,7 @@ """ dirs = ('../data', gajim.gajimpaths.root, gajim.DATA_DIR) for evt in gajim.config.get_per('soundevents'): - path = gajim.config.get_per('soundevents', evt ,'path') + path = gajim.config.get_per('soundevents', evt, 'path') # absolute and relative passes are necessary path = helpers.strip_soundfile_path(path, dirs, abs=False) path = helpers.strip_soundfile_path(path, dirs, abs=True) diff -r 35d52abee410 -r f9e51e9072a2 src/common/resolver.py --- a/src/common/resolver.py Wed Feb 10 16:17:09 2010 +0100 +++ b/src/common/resolver.py Wed Feb 10 19:24:11 2010 +0100 @@ -189,7 +189,7 @@ if not result: return [] hosts = [] - lines = result.replace('\r','').split('\n') + lines = result.replace('\r', '').split('\n') current_host = None for line in lines: line = line.lstrip() @@ -305,7 +305,7 @@ return def _compose_command_args(self): - return ['nslookup', '-type=' + self.type , self.host] + return ['nslookup', '-type=' + self.type, self.host] def _return_result(self): if self.result_handler: diff -r 35d52abee410 -r f9e51e9072a2 src/common/rst_xhtml_generator.py --- a/src/common/rst_xhtml_generator.py Wed Feb 10 16:17:09 2010 +0100 +++ b/src/common/rst_xhtml_generator.py Wed Feb 10 19:24:11 2010 +0100 @@ -25,7 +25,7 @@ from docutils import io from docutils.core import Publisher from docutils.parsers.rst import roles - from docutils import nodes,utils + from docutils import nodes, utils from docutils.parsers.rst.roles import set_classes except ImportError: print "Requires docutils 0.4 for set_classes to be available" @@ -91,7 +91,7 @@ generate_uri_role('xep-reference', ('jep', 'xep'), 'XEP #', 'http://www.xmpp.org/extensions/', 'xep-%04d.html', pos_int_validator) - generate_uri_role('gajim-ticket-reference', ('ticket','gtrack'), + generate_uri_role('gajim-ticket-reference', ('ticket', 'gtrack'), 'Gajim Ticket #', 'http://trac.gajim.org/ticket/', '%d', pos_int_validator) diff -r 35d52abee410 -r f9e51e9072a2 src/common/socks5.py --- a/src/common/socks5.py Wed Feb 10 16:17:09 2010 +0100 +++ b/src/common/socks5.py Wed Feb 10 19:24:11 2010 +0100 @@ -387,7 +387,7 @@ def open_file_for_reading(self): if self.file is None: try: - self.file = open(self.file_props['file-name'],'rb') + self.file = open(self.file_props['file-name'], 'rb') if 'offset' in self.file_props and self.file_props['offset']: self.size = self.file_props['offset'] self.file.seek(self.size) @@ -448,7 +448,7 @@ self.disconnect() return add - def send_raw(self,raw_data): + def send_raw(self, raw_data): """ Write raw outgoing data """ @@ -651,7 +651,7 @@ host, = '.'.join(str(s) for s in host_arr) host_len = len(host) elif host_type == 0x03: - host_len, = struct.unpack('!B' , buff[4]) + host_len, = struct.unpack('!B', buff[4]) host, = struct.unpack('!%ds' % host_len, buff[5:5 + host_len]) portlen = len(buff[host_len + 5:]) if portlen == 1: diff -r 35d52abee410 -r f9e51e9072a2 src/common/stanza_session.py --- a/src/common/stanza_session.py Wed Feb 10 16:17:09 2010 +0100 +++ b/src/common/stanza_session.py Wed Feb 10 19:24:11 2010 +0100 @@ -424,7 +424,7 @@

1 0

gajim: fix pylint warnings
by Yann Leboulanger 10 Feb '10

10 Feb '10

changeset 35d52abee410 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=35d52abee410 description: fix pylint warnings diffstat: src/chat_control.py | 4 +- src/gtkgui_helpers.py | 85 ++++++++++++++++++++++++++++---------------------- src/profile_window.py | 4 +- src/vcard.py | 4 +- 4 files changed, 53 insertions(+), 44 deletions(-) diffs (269 lines): diff -r 969a8566558a -r 35d52abee410 src/chat_control.py --- a/src/chat_control.py Wed Feb 10 15:29:50 2010 +0100 +++ b/src/chat_control.py Wed Feb 10 16:17:09 2010 +0100 @@ -1708,8 +1708,8 @@ menu = gtk.Menu() menuitem = gtk.ImageMenuItem(gtk.STOCK_SAVE_AS) id_ = menuitem.connect('activate', - gtkgui_helpers.on_avatar_save_as_menuitem_activate, - self.contact.jid, self.account, self.contact.get_shown_name()) + gtkgui_helpers.on_avatar_save_as_menuitem_activate, + self.contact.jid, self.contact.get_shown_name()) self.handlers[id_] = menuitem menu.append(menuitem) menu.show_all() diff -r 969a8566558a -r 35d52abee410 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Wed Feb 10 15:29:50 2010 +0100 +++ b/src/gtkgui_helpers.py Wed Feb 10 16:17:09 2010 +0100 @@ -189,7 +189,8 @@ xdg_config_home = os.environ.get('XDG_CONFIG_HOME', '') if xdg_config_home == '': xdg_config_home = os.path.expanduser('~/.config') # default - xfce_config_file = os.path.join(xdg_config_home, 'xfce4/mcs_settings/gtk.xml') + xfce_config_file = os.path.join(xdg_config_home, + 'xfce4/mcs_settings/gtk.xml') kde_config_file = os.path.expanduser('~/.kde/share/config/kdeglobals') @@ -201,7 +202,8 @@ return line[start:line.find('"', start)].decode('utf-8') except Exception: #we talk about file - print >> sys.stderr, _('Error: cannot open %s for reading') % xfce_config_file + print >> sys.stderr, _('Error: cannot open %s for reading') % \ + xfce_config_file elif os.path.exists(kde_config_file): try: @@ -216,7 +218,8 @@ return font_string.decode('utf-8') except Exception: #we talk about file - print >> sys.stderr, _('Error: cannot open %s for reading') % kde_config_file + print >> sys.stderr, _('Error: cannot open %s for reading') % \ + kde_config_file return None @@ -261,7 +264,7 @@ files = os.listdir('/proc') # files that doesn't have only digits in names... - files = filter(str.isdigit, files) + files = [f for f in files if f.isdigit()] # files that aren't directories... files = [f for f in files if os.path.isdir('/proc/' + f)] @@ -275,7 +278,8 @@ files = [f for f in files if os.path.islink('/proc/' + f + '/exe')] # list of processes - processes = [os.path.basename(os.readlink('/proc/' + f +'/exe')) for f in files] + processes = [os.path.basename(os.readlink('/proc/' + f +'/exe')) for f \ + in files] return processes return [] @@ -314,7 +318,8 @@ def cleanID(self, id_): id_ = id_.strip().lower() - for strip in (' :.-_'): id_ = id_.replace(strip, '') + for strip in (' :.-_'): + id_ = id_.replace(strip, '') return id_ def __eq__(self, other): @@ -436,7 +441,8 @@ os.chmod(path_to_script, 0700) except OSError: # do not traceback (could be a permission problem) #we talk about a file here - s = _('Could not write to %s. Session Management support will not work') % path_to_script + s = _('Could not write to %s. Session Management support will ' + 'not work') % path_to_script print >> sys.stderr, s else: # normal user (not svn user) @@ -541,13 +547,13 @@ try: # try make a handle for READING the file hfile = win32file.CreateFile( - path_to_file, # path to file - win32con.GENERIC_READ, # open for reading - 0, # do not share with other proc + path_to_file, # path to file + win32con.GENERIC_READ, # open for reading + 0, # do not share with other proc secur_att, - win32con.OPEN_EXISTING, # existing file only + win32con.OPEN_EXISTING, # existing file only win32con.FILE_ATTRIBUTE_NORMAL, # normal file - 0 # no attr. template + 0 # no attr. template ) except pywintypes.error: return True @@ -756,8 +762,10 @@ # setting for GNOME/Gconf client.set_bool('/desktop/gnome/url-handlers/xmpp/enabled', True) - client.set_string('/desktop/gnome/url-handlers/xmpp/command', command) - client.set_bool('/desktop/gnome/url-handlers/xmpp/needs_terminal', False) + client.set_string('/desktop/gnome/url-handlers/xmpp/command', + command) + client.set_bool('/desktop/gnome/url-handlers/xmpp/needs_terminal', + False) # setting for KDE if path_to_kde_file is not None: # user has run kde at least once @@ -780,7 +788,8 @@ ''' % command) f.close() except IOError: - log.debug("I/O Error writing settings to %s", repr(path_to_kde_file), exc_info=True) + log.debug("I/O Error writing settings to %s", + repr(path_to_kde_file), exc_info=True) else: # no gajim remote, stop ask user everytime gajim.config.set('check_if_gajim_is_default', False) @@ -807,12 +816,12 @@ # xmpp: is currently handled by another program, so ask the user pritext = _('Gajim is not the default Jabber client') sectext = _('Would you like to make Gajim the default Jabber client?') - checktext = _('Always check to see if Gajim is the default Jabber client ' - 'on startup') + checktext = _('Always check to see if Gajim is the default Jabber ' + 'client on startup') def on_cancel(checked): gajim.config.set('check_if_gajim_is_default', checked) dlg = dialogs.ConfirmationDialogCheck(pritext, sectext, checktext, - set_gajim_as_xmpp_handler, on_cancel) + set_gajim_as_xmpp_handler, on_cancel) if gajim.config.get('check_if_gajim_is_default'): dlg.checkbutton.set_active(True) @@ -849,12 +858,12 @@ def destroy_widget(widget): widget.destroy() -def on_avatar_save_as_menuitem_activate(widget, jid, account, default_name=''): +def on_avatar_save_as_menuitem_activate(widget, jid, default_name=''): def on_continue(response, file_path): if response < 0: return pixbuf = get_avatar_pixbuf_from_cache(jid) - path, extension = os.path.splitext(file_path) + extension = os.path.splitext(file_path)[1] if not extension: # Silently save as Jpeg image image_format = 'jpeg' @@ -875,9 +884,10 @@ def on_ok(file_path, pixbuf): pixbuf.save(file_path, 'jpeg') dialogs.ConfirmationDialog(_('Extension not supported'), - _('Image cannot be saved in %(type)s format. Save as %(new_filename)s?' - ) % {'type': image_format, 'new_filename': new_file_path}, - on_response_ok = (on_ok, new_file_path, pixbuf)) + _('Image cannot be saved in %(type)s format. Save as ' + '%(new_filename)s?') % {'type': image_format, + 'new_filename': new_file_path}, + on_response_ok = (on_ok, new_file_path, pixbuf)) else: dialog.destroy() @@ -888,22 +898,21 @@ # check if we have write permissions if not os.access(file_path, os.W_OK): file_name = os.path.basename(file_path) - dialogs.ErrorDialog(_('Cannot overwrite existing file "%s"' % - file_name), - _('A file with this name already exists and you do not have ' - 'permission to overwrite it.')) + dialogs.ErrorDialog(_('Cannot overwrite existing file "%s"') % \ + file_name, _('A file with this name already exists and you ' + 'do not have permission to overwrite it.')) return dialog2 = dialogs.FTOverwriteConfirmationDialog( - _('This file already exists'), _('What do you want to do?'), - propose_resume=False, on_response=(on_continue, file_path)) + _('This file already exists'), _('What do you want to do?'), + propose_resume=False, on_response=(on_continue, file_path)) dialog2.set_transient_for(dialog) dialog2.set_destroy_with_parent(True) else: dirname = os.path.dirname(file_path) if not os.access(dirname, os.W_OK): dialogs.ErrorDialog(_('Directory "%s" is not writable') % \ - dirname, _('You do not have permission to create files in this' - ' directory.')) + dirname, _('You do not have permission to create files in ' + 'this directory.')) return on_continue(0, file_path) @@ -912,15 +921,15 @@ dialog.destroy() dialog = dialogs.FileChooserDialog(title_text=_('Save Image as...'), - action=gtk.FILE_CHOOSER_ACTION_SAVE, buttons=(gtk.STOCK_CANCEL, - gtk.RESPONSE_CANCEL, gtk.STOCK_SAVE, gtk.RESPONSE_OK), - default_response=gtk.RESPONSE_OK, - current_folder=gajim.config.get('last_save_dir'), on_response_ok=on_ok, - on_response_cancel=on_cancel) + action=gtk.FILE_CHOOSER_ACTION_SAVE, buttons=(gtk.STOCK_CANCEL, + gtk.RESPONSE_CANCEL, gtk.STOCK_SAVE, gtk.RESPONSE_OK), + default_response=gtk.RESPONSE_OK, + current_folder=gajim.config.get('last_save_dir'), on_response_ok=on_ok, + on_response_cancel=on_cancel) dialog.set_current_name(default_name + '.jpeg') dialog.connect('delete-event', lambda widget, event: - on_cancel(widget)) + on_cancel(widget)) def on_bm_header_changed_state(widget, event): widget.set_state(gtk.STATE_NORMAL) #do not allow selected_state @@ -1124,7 +1133,7 @@ # set wrap width to the pango.Layout of the labels ### layout.set_width (allocation.width * pango.SCALE) - lw, lh = layout.get_size () + lh = layout.get_size()[1] if lh_old != lh: widget.set_size_request (-1, lh / pango.SCALE) diff -r 969a8566558a -r 35d52abee410 src/profile_window.py --- a/src/profile_window.py Wed Feb 10 15:29:50 2010 +0100 +++ b/src/profile_window.py Wed Feb 10 16:17:09 2010 +0100 @@ -189,8 +189,8 @@ nick = gajim.config.get_per('accounts', self.account, 'name') menuitem = gtk.ImageMenuItem(gtk.STOCK_SAVE_AS) menuitem.connect('activate', - gtkgui_helpers.on_avatar_save_as_menuitem_activate, - self.jid, self.account, nick) + gtkgui_helpers.on_avatar_save_as_menuitem_activate, + self.jid, nick) menu.append(menuitem) # show clear menuitem = gtk.ImageMenuItem(gtk.STOCK_CLEAR) diff -r 969a8566558a -r 35d52abee410 src/vcard.py --- a/src/vcard.py Wed Feb 10 15:29:50 2010 +0100 +++ b/src/vcard.py Wed Feb 10 16:17:09 2010 +0100 @@ -164,7 +164,7 @@ menuitem = gtk.ImageMenuItem(gtk.STOCK_SAVE_AS) menuitem.connect('activate', gtkgui_helpers.on_avatar_save_as_menuitem_activate, - self.contact.jid, self.account, self.contact.get_shown_name()) + self.contact.jid, self.contact.get_shown_name()) menu.append(menuitem) menu.connect('selection-done', lambda w:w.destroy()) # show the menu @@ -479,7 +479,7 @@ menuitem = gtk.ImageMenuItem(gtk.STOCK_SAVE_AS) menuitem.connect('activate', gtkgui_helpers.on_avatar_save_as_menuitem_activate, - self.contact.jid, self.account, self.contact.get_shown_name()) + self.contact.jid, self.contact.get_shown_name()) menu.append(menuitem) menu.connect('selection-done', lambda w:w.destroy()) # show the menu

1 0

gajim: fix line width and some pylint errors
by Yann Leboulanger 10 Feb '10

10 Feb '10

changeset 969a8566558a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=969a8566558a description: fix line width and some pylint errors diffstat: src/adhoc_commands.py | 69 ++++++++++++++++++++++++++------------------------ 1 files changed, 36 insertions(+), 33 deletions(-) diffs (211 lines): diff -r 5aea2f6f92fe -r 969a8566558a src/adhoc_commands.py --- a/src/adhoc_commands.py Wed Feb 10 15:09:35 2010 +0100 +++ b/src/adhoc_commands.py Wed Feb 10 15:29:50 2010 +0100 @@ -56,8 +56,8 @@ self.account = gajim.connections[account] self.jid = jid - self.pulse_id=None # to satisfy self.setup_pulsing() - self.commandlist=None # a list of (commandname, commanddescription) + self.pulse_id = None # to satisfy self.setup_pulsing() + self.commandlist = None # a list of (commandname, commanddescription) # command's data self.commandnode = commandnode @@ -68,7 +68,8 @@ # retrieving widgets from xml self.xml = gtkgui_helpers.get_gtk_builder('adhoc_commands_window.ui') self.window = self.xml.get_object('adhoc_commands_window') - self.window.connect('delete-event', self.on_adhoc_commands_window_delete_event) + self.window.connect('delete-event', + self.on_adhoc_commands_window_delete_event) for name in ('back_button', 'forward_button', 'execute_button','close_button','stages_notebook', 'retrieving_commands_stage_vbox', @@ -130,7 +131,7 @@ return self.stage_close_button_clicked(*anything) def on_adhoc_commands_window_destroy(self, *anything): - # TODO: do all actions that are needed to remove this object from memory... + # TODO: do all actions that are needed to remove this object from memory self.remove_pulsing() def on_adhoc_commands_window_delete_event(self, *anything): @@ -167,7 +168,8 @@ # setup the callbacks self.stage_finish = self.stage1_finish self.stage_close_button_clicked = self.stage1_close_button_clicked - self.stage_adhoc_commands_window_delete_event = self.stage1_adhoc_commands_window_delete_event + self.stage_adhoc_commands_window_delete_event = \ + self.stage1_adhoc_commands_window_delete_event def stage1_finish(self): self.remove_pulsing() @@ -196,8 +198,7 @@ assert len(self.commandlist)>0 self.stages_notebook.set_current_page( - self.stages_notebook.page_num( - self.command_list_stage_vbox)) + self.stages_notebook.page_num(self.command_list_stage_vbox)) self.close_button.set_sensitive(True) self.back_button.set_sensitive(False) @@ -208,7 +209,8 @@ first_radio = None for (commandnode, commandname) in self.commandlist: radio = gtk.RadioButton(first_radio, label=commandname) - radio.connect("toggled", self.on_command_radiobutton_toggled, commandnode) + radio.connect("toggled", self.on_command_radiobutton_toggled, + commandnode) if not first_radio: first_radio = radio self.commandnode = commandnode @@ -266,7 +268,8 @@ self.stage_forward_button_clicked = self.stage3_forward_button_clicked self.stage_execute_button_clicked = self.stage3_execute_button_clicked self.stage_close_button_clicked = self.stage3_close_button_clicked - self.stage_adhoc_commands_window_delete_event = self.stage3_close_button_clicked + self.stage_adhoc_commands_window_delete_event = \ + self.stage3_close_button_clicked def stage3_finish(self): pass @@ -276,10 +279,10 @@ We are in the middle of executing command. Ask user if he really want to cancel the process, then cancel it """ - # this works also as a handler for window_delete_event, so we have to return appropriate - # values + # this works also as a handler for window_delete_event, so we have to + # return appropriate values if self.form_status == 'completed': - if widget!=self.window: + if widget != self.window: self.window.destroy() return False @@ -291,10 +294,10 @@ self.allow_stage3_close = True self.window.destroy() - dialog = dialogs.HigDialog(self.window, gtk.DIALOG_DESTROY_WITH_PARENT | \ - gtk.DIALOG_MODAL, gtk.BUTTONS_YES_NO, _('Cancel confirmation'), - _('You are in process of executing command. Do you really want to ' - 'cancel it?'), on_response_yes=on_yes) + dialog = dialogs.HigDialog(self.window, gtk.DIALOG_DESTROY_WITH_PARENT \ + | gtk.DIALOG_MODAL, gtk.BUTTONS_YES_NO, _('Cancel confirmation'), + _('You are in process of executing command. Do you really want to ' + 'cancel it?'), on_response_yes=on_yes) dialog.popup() return True # Block event, don't close window @@ -310,7 +313,7 @@ def stage3_submit_form(self, action='execute'): self.data_form_widget.set_sensitive(False) if self.data_form_widget.get_data_form(): - self.data_form_widget.data_form.type='submit' + self.data_form_widget.data_form.type = 'submit' else: self.data_form_widget.hide() @@ -346,9 +349,10 @@ self.data_form_widget.set_sensitive(True) try: - self.data_form_widget.data_form=self.dataform + self.data_form_widget.data_form = self.dataform except dataforms.Error: - self.stage5(error=_('Service sent malformed data'), senderror=True) + self.stage5(error=_('Service sent malformed data'), + senderror=True) return self.data_form_widget.show() if self.data_form_widget.title: @@ -362,7 +366,8 @@ # actions, actions, actions... self.close_button.set_sensitive(True) self.back_button.set_sensitive(actions.getTag('prev') is not None) - self.forward_button.set_sensitive(actions.getTag('next') is not None) + self.forward_button.set_sensitive( + actions.getTag('next') is not None) self.execute_button.set_sensitive(True) else: self.close_button.set_sensitive(True) @@ -376,7 +381,8 @@ self.forward_button.hide() self.execute_button.hide() self.close_button.show() - self.stage_adhoc_commands_window_delete_event = self.stage3_close_button_clicked + self.stage_adhoc_commands_window_delete_event = \ + self.stage3_close_button_clicked note = command.getTag('note') if note: @@ -396,8 +402,7 @@ self.stage_finish() self.stages_notebook.set_current_page( - self.stages_notebook.page_num( - self.no_commands_stage_vbox)) + self.stages_notebook.page_num(self.no_commands_stage_vbox)) self.close_button.set_sensitive(True) self.back_button.set_sensitive(False) @@ -442,8 +447,7 @@ assert False self.stages_notebook.set_current_page( - self.stages_notebook.page_num( - self.error_stage_vbox)) + self.stages_notebook.page_num(self.error_stage_vbox)) self.close_button.set_sensitive(True) self.back_button.hide() @@ -481,14 +485,15 @@ """ if self.pulse_id: gobject.source_remove(self.pulse_id) - self.pulse_id=None + self.pulse_id = None # handling xml stanzas def request_command_list(self): """ Request the command list. Change stage on delivery """ - query = xmpp.Iq(typ='get', to=xmpp.JID(self.jid), queryNS=xmpp.NS_DISCO_ITEMS) + query = xmpp.Iq(typ='get', to=xmpp.JID(self.jid), + queryNS=xmpp.NS_DISCO_ITEMS) query.setQuerynode(xmpp.NS_COMMANDS) def callback(response): @@ -512,7 +517,8 @@ self.commandlist = [] self.stage4() else: - self.commandlist = [(t.getAttr('node'), t.getAttr('name')) for t in items] + self.commandlist = [(t.getAttr('node'), t.getAttr('name')) \ + for t in items] self.stage2() self.account.connection.SendAndCallForResponse(query, callback) @@ -533,9 +539,6 @@ cmdnode.setAttr('sessionid', self.sessionid) if self.data_form_widget.data_form: -# cmdnode.addChild(node=dataforms.DataForm(tofill=self.data_form_widget.data_form)) - # FIXME: simplified form to send - cmdnode.addChild(node=self.data_form_widget.data_form) def callback(response): @@ -564,6 +567,6 @@ self.account.connection.send(stanza) else: - # we did not received any reply from service; FIXME: we should wait and - # then send cancel; for now we do nothing + # we did not received any reply from service; + # FIXME: we should wait and then send cancel; for now we do nothing pass

1 0

gajim: fix line width and some warning from pylint
by Yann Leboulanger 10 Feb '10

10 Feb '10

changeset 5aea2f6f92fe in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5aea2f6f92fe description: fix line width and some warning from pylint diffstat: scripts/dev/run-pylint.py | 2 +- src/gui_interface.py | 879 +++++++++++++++++++++++++-------------------- 2 files changed, 492 insertions(+), 389 deletions(-) diffs (truncated from 1884 to 300 lines): diff -r cd82b570038f -r 5aea2f6f92fe scripts/dev/run-pylint.py --- a/scripts/dev/run-pylint.py Wed Feb 10 14:00:28 2010 +0100 +++ b/scripts/dev/run-pylint.py Wed Feb 10 15:09:35 2010 +0100 @@ -7,5 +7,5 @@ if os.getcwd().endswith('dev'): os.chdir('../../src/') # we were in scripts/dev -os.system("pylint --additional-builtins='_' --disable-msg=C0111,C0103,C0111,C0112 --disable-checker=design " + "".join(sys.argv[1:])) +os.system("pylint --include-ids=y --additional-builtins='_' --disable-msg=C0103,C0111,W0703,W0511,W0142 --disable-checker=design " + "".join(sys.argv[1:])) diff -r cd82b570038f -r 5aea2f6f92fe src/gui_interface.py --- a/src/gui_interface.py Wed Feb 10 14:00:28 2010 +0100 +++ b/src/gui_interface.py Wed Feb 10 15:09:35 2010 +0100 @@ -78,7 +78,6 @@ from common import helpers from common import dataforms from common import passwords -from common import pep from common import logging_helpers import roster_window @@ -129,20 +128,19 @@ room_jid = data[0] title = _('Unable to join group chat') prompt = _('Your desired nickname in group chat %s is in use or ' - 'registered by another occupant.\nPlease specify another nickname ' - 'below:') % room_jid + 'registered by another occupant.\nPlease specify another nickname ' + 'below:') % room_jid check_text = _('Always use this nickname when there is a conflict') if 'change_nick_dialog' in self.instances: self.instances['change_nick_dialog'].add_room(account, room_jid, - prompt) + prompt) else: self.instances['change_nick_dialog'] = dialogs.ChangeNickDialog( - account, room_jid, title, prompt) + account, room_jid, title, prompt) def handle_event_http_auth(self, account, data): #('HTTP_AUTH', account, (method, url, transaction_id, iq_obj, msg)) def response(account, iq_obj, answer): - self.dialog.destroy() gajim.connections[account].build_http_auth_answer(iq_obj, answer) def on_yes(is_checked, account, iq_obj): @@ -153,10 +151,10 @@ sec_msg = _('Do you accept this request on account %s?') % account if data[4]: sec_msg = data[4] + '\n' + sec_msg - self.dialog = dialogs.YesNoDialog(_('HTTP (%(method)s) Authorization for ' - '%(url)s (id: %(id)s)') % {'method': data[0], 'url': data[1], - 'id': data[2]}, sec_msg, on_response_yes=(on_yes, account, data[3]), - on_response_no=(response, account, data[3], 'no')) + dialog = dialogs.YesNoDialog(_('HTTP (%(method)s) Authorization for ' + '%(url)s (id: %(id)s)') % {'method': data[0], 'url': data[1], + 'id': data[2]}, sec_msg, on_response_yes=(on_yes, account, data[3]), + on_response_no=(response, account, data[3], 'no')) def handle_event_error_answer(self, account, array): #('ERROR_ANSWER', account, (id, jid_from, errmsg, errcode)) @@ -213,8 +211,8 @@ model = self.roster.status_combobox.get_model() if show in ('offline', 'error'): for name in self.instances[account]['online_dialog'].keys(): - # .keys() is needed to not have a dictionary length changed during - # iteration error + # .keys() is needed to not have a dictionary length changed + # during iteration error self.instances[account]['online_dialog'][name].destroy() del self.instances[account]['online_dialog'][name] for request in self.gpg_passphrase.values(): @@ -232,7 +230,8 @@ # we stop blocking notifications of any kind # this prevents from getting the roster items as 'just signed in' # contacts. 30 seconds should be enough time - gobject.timeout_add_seconds(30, self.unblock_signed_in_notifications, account) + gobject.timeout_add_seconds(30, + self.unblock_signed_in_notifications, account) # sensitivity for this menuitem model[self.roster.status_message_menuitem_iter][3] = True @@ -335,11 +334,12 @@ contact1.contact_name = contact_nickname self.roster.draw_contact(jid, account) - if old_show == new_show and contact1.status == status_message and \ - contact1.priority == priority: # no change + if old_show == new_show and contact1.status == status_message \ + and contact1.priority == priority: # no change return else: - contact1 = gajim.contacts.get_first_contact_from_jid(account, ji) + contact1 = gajim.contacts.get_first_contact_from_jid(account, + ji) if not contact1: # Presence of another resource of our # jid @@ -350,8 +350,8 @@ if new_show < 2: return contact1 = gajim.contacts.create_self_contact(jid=ji, - account=account, show=array[1], status=status_message, - priority=priority, keyID=keyID, resource=resource) + account=account, show=array[1], status=status_message, + priority=priority, keyID=keyID, resource=resource) old_show = 0 gajim.contacts.add_contact(account, contact1) lcontact.append(contact1) @@ -374,20 +374,20 @@ gajim.newly_added[account].append(contact1.jid) if contact1.jid in gajim.to_be_removed[account]: gajim.to_be_removed[account].remove(contact1.jid) - gobject.timeout_add_seconds(5, self.roster.remove_newly_added, - contact1.jid, account) + gobject.timeout_add_seconds(5, + self.roster.remove_newly_added, contact1.jid, account) elif old_show > 1 and new_show == 0 and conn.connected > 1: if not contact1.jid in gajim.to_be_removed[account]: gajim.to_be_removed[account].append(contact1.jid) if contact1.jid in gajim.newly_added[account]: gajim.newly_added[account].remove(contact1.jid) self.roster.draw_contact(contact1.jid, account) - gobject.timeout_add_seconds(5, self.roster.remove_to_be_removed, - contact1.jid, account) + gobject.timeout_add_seconds(5, + self.roster.remove_to_be_removed, contact1.jid, account) # unset custom status - if (old_show == 0 and new_show > 1) or (old_show > 1 and new_show == 0\ - and conn.connected > 1): + if (old_show == 0 and new_show > 1) or \ + (old_show > 1 and new_show == 0 and conn.connected > 1): if account in self.status_sent_to_users and \ jid in self.status_sent_to_users[account]: del self.status_sent_to_users[account][jid] @@ -468,9 +468,11 @@ array)) elif old_show > 1 and new_show < 2: - notify.notify('contact_disconnected', jid, account, status_message) + notify.notify('contact_disconnected', jid, account, + status_message) if self.remote_ctrl: - self.remote_ctrl.raise_signal('ContactAbsence', (account, array)) + self.remote_ctrl.raise_signal('ContactAbsence', (account, + array)) # FIXME: stop non active file transfers # Status change (not connected/disconnected or # error (<1)) @@ -478,18 +480,20 @@ notify.notify('status_change', jid, account, [new_show, status_message]) if self.remote_ctrl: - self.remote_ctrl.raise_signal('ContactStatus', (account, array)) + self.remote_ctrl.raise_signal('ContactStatus', (account, + array)) else: # FIXME: MSN transport (CMSN1.2.1 and PyMSN) don't # follow the XEP, still the case in 2008. # It's maybe a GC_NOTIFY (specialy for MSN gc) self.handle_event_gc_notify(account, (jid, array[1], status_message, - array[3], None, None, None, None, None, [], None, None)) + array[3], None, None, None, None, None, [], None, None)) highest = gajim.contacts.get_contact_with_highest_priority(account, jid) is_highest = (highest and highest.resource == resource) - # disconnect the session from the ctrl if the highest resource has changed + # disconnect the session from the ctrl if the highest resource has + # changed if (was_highest and not is_highest) or (not was_highest and is_highest): ctrl = self.msg_win_mgr.get_control(jid, account) @@ -499,7 +503,8 @@ ctrl.contact = highest def handle_event_msgerror(self, account, array): - #'MSGERROR' (account, (jid, error_code, error_msg, msg, time[, session])) + #'MSGERROR' (account, (jid, error_code, error_msg, msg, time[, + # session])) full_jid_with_resource = array[0] jids = full_jid_with_resource.split('/', 1) jid = jids[0] @@ -526,7 +531,8 @@ if session: ctrl = session.control else: - ctrl = self.msg_win_mgr.get_control(full_jid_with_resource, account) + ctrl = self.msg_win_mgr.get_control(full_jid_with_resource, + account) if not ctrl: tv = gc_control.list_treeview @@ -536,17 +542,18 @@ show = model[iter_][3] else: show = 'offline' - gc_c = gajim.contacts.create_gc_contact(room_jid=jid, account=account, - name=nick, show=show) + gc_c = gajim.contacts.create_gc_contact(room_jid=jid, + account=account, name=nick, show=show) ctrl = self.new_private_chat(gc_c, account, session) ctrl.print_conversation(_('Error %(code)s: %(msg)s') % { - 'code': array[1], 'msg': array[2]}, 'status') + 'code': array[1], 'msg': array[2]}, 'status') return gc_control.print_conversation(_('Error %(code)s: %(msg)s') % { - 'code': array[1], 'msg': array[2]}, 'status') - if gc_control.parent_win and gc_control.parent_win.get_active_jid() == jid: + 'code': array[1], 'msg': array[2]}, 'status') + if gc_control.parent_win and \ + gc_control.parent_win.get_active_jid() == jid: gc_control.set_subject(gc_control.subject) return @@ -563,7 +570,8 @@ #('MSGSENT', account, (jid, msg, keyID)) msg = array[1] # do not play sound when standalone chatstate message (eg no msg) - if msg and gajim.config.get_per('soundevents', 'message_sent', 'enabled'): + if msg and gajim.config.get_per('soundevents', 'message_sent', + 'enabled'): helpers.play_sound('message_sent') def handle_event_msgnotsent(self, account, array): @@ -571,7 +579,8 @@ msg = _('error while sending %(message)s ( %(error)s )') % { 'message': array[2], 'error': array[1]} if not array[4]: - # No session. This can happen when sending a message from gajim-remote + # No session. This can happen when sending a message from + # gajim-remote log.warn(msg) return array[4].roster_message(array[0], msg, array[3], account, @@ -592,10 +601,11 @@ self.add_event(account, jid, 'subscription_request', (text, nick)) if helpers.allow_showing_notification(account): - path = gtkgui_helpers.get_icon_path('gajim-subscription_request', 48) + path = gtkgui_helpers.get_icon_path('gajim-subscription_request', + 48) event_type = _('Subscription request') notify.popup(event_type, jid, account, 'subscription_request', path, - event_type, jid) + event_type, jid) def handle_event_subscribed(self, account, array): #('SUBSCRIBED', account, (jid, resource)) @@ -604,24 +614,25 @@ c = gajim.contacts.get_first_contact_from_jid(account, jid) c.resource = array[1] self.roster.remove_contact_from_groups(c.jid, account, - [_('Not in Roster'), _('Observers')], update=False) + [_('Not in Roster'), _('Observers')], update=False) else: keyID = '' attached_keys = gajim.config.get_per('accounts', account, - 'attached_gpg_keys').split() + 'attached_gpg_keys').split() if jid in attached_keys: keyID = attached_keys[attached_keys.index(jid) + 1] name = jid.split('@', 1)[0] name = name.split('%', 1)[0] contact1 = gajim.contacts.create_contact(jid=jid, account=account, - name=name, groups=[], show='online', status='online', - ask='to', resource=array[1], keyID=keyID) + name=name, groups=[], show='online', status='online', ask='to', + resource=array[1], keyID=keyID) gajim.contacts.add_contact(account, contact1) self.roster.add_contact(jid, account) dialogs.InformationDialog(_('Authorization accepted'), - _('The contact "%s" has authorized you to see his or her status.') - % jid) - if not gajim.config.get_per('accounts', account, 'dont_ack_subscription'): + _('The contact "%s" has authorized you to see his or her status.') + % jid) + if not gajim.config.get_per('accounts', account, + 'dont_ack_subscription'): gajim.connections[account].ack_subscribed(jid) if self.remote_ctrl: self.remote_ctrl.raise_signal('Subscribed', (account, array)) @@ -811,7 +822,8 @@ def handle_event_gc_notify(self, account, array): #'GC_NOTIFY' (account, (room_jid, show, status, nick, - # role, affiliation, jid, reason, actor, statusCode, newNick, avatar_sha)) + # role, affiliation, jid, reason, actor, statusCode, newNick, + # avatar_sha)) nick = array[3] if not nick: return @@ -829,14 +841,15 @@ room_jid in self.minimized_controls[account]: control = self.minimized_controls[account][room_jid] - if not control or (control and control.type_id != message_control.TYPE_GC):

1 0

gajim: rename some variables to remove some pylint warning
by Yann Leboulanger 10 Feb '10

10 Feb '10

changeset cd82b570038f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cd82b570038f description: rename some variables to remove some pylint warning diffstat: src/gajim.py | 63 ++++++++++++++++++++++++++--------------------------------- 1 files changed, 28 insertions(+), 35 deletions(-) diffs (150 lines): diff -r 2c1a7c31d18f -r cd82b570038f src/gajim.py --- a/src/gajim.py Tue Feb 09 22:40:08 2010 +0100 +++ b/src/gajim.py Wed Feb 10 14:00:28 2010 +0100 @@ -70,15 +70,15 @@ from common import i18n def parseOpts(): - profile = '' - config_path = None + profile_ = '' + config_path_ = None try: shortargs = 'hqvl:p:c:' longargs = 'help quiet verbose loglevel= profile= config_path=' opts = getopt.getopt(sys.argv[1:], shortargs, longargs.split())[0] - except getopt.error, msg: - print msg + except getopt.error, msg1: + print msg1 print 'for help use --help' sys.exit(2) for o, a in opts: @@ -92,12 +92,12 @@ elif o in ('-v', '--verbose'): logging_helpers.set_verbose() elif o in ('-p', '--profile'): # gajim --profile name - profile = a + profile_ = a elif o in ('-l', '--loglevel'): logging_helpers.set_loglevels(a) elif o in ('-c', '--config-path'): - config_path = a - return profile, config_path + config_path_ = a + return profile_, config_path_ profile, config_path = parseOpts() del parseOpts @@ -136,11 +136,11 @@ warnings.filterwarnings('error', module='gtk') try: import gtk -except Warning, msg: - if str(msg) == 'could not open display': +except Warning, msg2: + if str(msg2) == 'could not open display': print >> sys.stderr, _('Gajim needs X server to run. Quiting...') else: - print >> sys.stderr, _('importing PyGTK failed: %s') % str(msg) + print >> sys.stderr, _('importing PyGTK failed: %s') % str(msg2) sys.exit() warnings.resetwarnings() @@ -268,7 +268,7 @@ ('szExeFile', c_char*512, ), ] def __init__(self): - Structure.__init__(self, 512+9*4) + super(PROCESSENTRY32, self).__init__(self, 512+9*4) k = windll.kernel32 k.CreateToolhelp32Snapshot.argtypes = c_ulong, c_ulong, @@ -278,15 +278,15 @@ k.Process32Next.argtypes = c_int, POINTER(PROCESSENTRY32), k.Process32Next.restype = c_int - def get_p(p): + def get_p(pid_): h = k.CreateToolhelp32Snapshot(2, 0) # TH32CS_SNAPPROCESS assert h > 0, 'CreateToolhelp32Snapshot failed' b = pointer(PROCESSENTRY32()) - f = k.Process32First(h, b) - while f: - if b.contents.th32ProcessID == p: + f3 = k.Process32First(h, b) + while f3: + if b.contents.th32ProcessID == pid_: return b.contents.szExeFile - f = k.Process32Next(h, b) + f3 = k.Process32Next(h, b) if get_p(pid) in ('python.exe', 'gajim.exe'): return True @@ -296,14 +296,14 @@ return True # no /proc, assume Gajim is running try: - f = open('/proc/%d/cmdline'% pid) - except IOError, e: - if e.errno == errno.ENOENT: + f1 = open('/proc/%d/cmdline'% pid) + except IOError, e1: + if e1.errno == errno.ENOENT: return False # file/pid does not exist raise - n = f.read().lower() - f.close() + n = f1.read().lower() + f1.close() if n.find('gajim') < 0: return False return True # Running Gajim found at pid @@ -338,16 +338,15 @@ check_paths.create_path(pid_dir) # Create pid file try: - f = open(pid_filename, 'w') - f.write(str(os.getpid())) - f.close() -except IOError, e: - dlg = dialogs.ErrorDialog(_('Disk Write Error'), str(e)) + f2 = open(pid_filename, 'w') + f2.write(str(os.getpid())) + f2.close() +except IOError, e2: + dlg = dialogs.ErrorDialog(_('Disk Write Error'), str(e2)) dlg.run() dlg.destroy() sys.exit() del pid_dir -del f def on_exit(): # delete pid file on normal exit @@ -379,7 +378,7 @@ except ImportError: pass else: - def die_cb(cli): + def die_cb(dummy): gajim.interface.roster.quit_gtkgui_interface() gnome.program_init('gajim', gajim.version) cli = gnome.ui.master_client() @@ -390,13 +389,7 @@ if path_to_gajim_script: argv = [path_to_gajim_script] - # FIXME: remove this typeerror catch when gnome python is old - # and not bad patched by distro men [2.12.0 + should not need - # all that NORMALLY] - try: - cli.set_restart_command(argv) - except AttributeError: - cli.set_restart_command(len(argv), argv) + cli.set_restart_command(len(argv), argv) check_paths.check_and_possibly_create_paths()

1 0

← Newer
1
...
5
6
7
8
9
10
11
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2010