Commits

commits@gajim.org

17632 discussions

gajim: [Darlan] Update Hebrew translation
by Denis Fomin 06 Jan '13

06 Jan '13

changeset b2c33dd5485f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b2c33dd5485f description: [Darlan] Update Hebrew translation diffstat: po/he.po | 2881 ++++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 1619 insertions(+), 1262 deletions(-) diffs (truncated from 6415 to 300 lines): diff -r 5f8bfea2054a -r b2c33dd5485f po/he.po --- a/po/he.po Fri Jan 04 09:46:13 2013 +0100 +++ b/po/he.po Sun Jan 06 15:21:23 2013 +0400 @@ -8,15 +8,15 @@ "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-11-15 14:27+0400\n" -"PO-Revision-Date: 2012-12-09 10:07+0200\n" +"PO-Revision-Date: 2013-01-06 13:21+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Hebrew\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.5.4\n" #: ../data/gui/account_context_menu.ui.h:1 #: ../data/gui/zeroconf_context_menu.ui.h:1 @@ -27,8 +27,7 @@ msgid "_Personal Events" msgstr "_אירועים אישיים" -#: ../data/gui/account_context_menu.ui.h:3 -#: ../data/gui/roster_window.ui.h:3 +#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3 msgid "_Start Chat..." msgstr "התחל _שיחה..." @@ -36,18 +35,16 @@ # שיחה מרובת משתתפים # שיחה קבוצתית # קבוצת שיחה -#: ../data/gui/account_context_menu.ui.h:4 -#: ../data/gui/roster_window.ui.h:5 +#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5 msgid "Join _Group Chat..." -msgstr "הצטרף אל שיחת _קבוצה..." +msgstr "שיחת _קבוצה..." #: ../data/gui/account_context_menu.ui.h:5 msgid "_Add Contact..." msgstr "הוסף _איש קשר..." # איתור -#: ../data/gui/account_context_menu.ui.h:6 -#: ../data/gui/roster_window.ui.h:7 +#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7 msgid "_Discover Services" msgstr "מצא _שירותים" @@ -90,12 +87,12 @@ #: ../data/gui/account_creation_wizard_window.ui.h:6 msgid "Please choose one of the options below:" -msgstr "נא לבחור באחת מן האפשרויות מטה:" +msgstr "אנא בחר באחת מן האפשרויות מטה:" # credentials #: ../data/gui/account_creation_wizard_window.ui.h:7 msgid "Please fill in the data for your existing account" -msgstr "נא להזין את נתוני ההתחברות עבור חשבונך הקיים" +msgstr "אנא מלא את נתוני ההתחברות עבור חשבונך הקיים" #: ../data/gui/account_creation_wizard_window.ui.h:8 #: ../data/gui/accounts_window.ui.h:22 @@ -198,27 +195,14 @@ msgstr "_סיום" #: ../data/gui/account_creation_wizard_window.ui.h:30 -#: ../data/gui/accounts_window.ui.h:1 -#: ../data/gui/change_mood_dialog.ui.h:1 -#: ../src/config.py:1254 -#: ../src/config.py:1268 -#: ../src/config.py:1273 -#: ../src/config.py:1321 -#: ../src/config.py:1424 -#: ../src/config.py:1739 -#: ../src/config.py:1744 -#: ../src/config.py:2320 -#: ../src/config.py:2399 -#: ../src/config.py:2412 -#: ../src/config.py:3698 -#: ../src/config.py:3773 -#: ../src/dialogs.py:313 -#: ../src/dialogs.py:315 -#: ../src/dialogs.py:521 -#: ../src/dialogs.py:534 -#: ../src/roster_window.py:3214 -#: ../src/roster_window.py:3220 -#: ../src/roster_window.py:3225 +#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1 +#: ../src/config.py:1254 ../src/config.py:1268 ../src/config.py:1273 +#: ../src/config.py:1321 ../src/config.py:1424 ../src/config.py:1739 +#: ../src/config.py:1744 ../src/config.py:2320 ../src/config.py:2399 +#: ../src/config.py:2412 ../src/config.py:3698 ../src/config.py:3773 +#: ../src/dialogs.py:313 ../src/dialogs.py:315 ../src/dialogs.py:521 +#: ../src/dialogs.py:534 ../src/roster_window.py:3214 +#: ../src/roster_window.py:3220 ../src/roster_window.py:3225 msgid "None" msgstr "ללא" @@ -227,28 +211,24 @@ msgstr "חשבונות" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:3 -#: ../src/dialogs.py:3426 +#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3426 #: ../src/dialogs.py:3472 msgid "Add" msgstr "הוספה" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:4 -#: ../src/dialogs.py:3430 +#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3430 #: ../src/dialogs.py:3527 msgid "Delete" msgstr "מחיקה" #. Rename -#: ../data/gui/accounts_window.ui.h:5 -#: ../src/roster_window.py:5844 +#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5844 msgid "Re_name" msgstr "_שנה שם" #. XML Console enable checkbutton -#: ../data/gui/accounts_window.ui.h:6 -#: ../data/gui/xml_console_window.ui.h:3 +#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3 msgid "_Enable" msgstr "א_פשר" @@ -258,20 +238,24 @@ msgstr "התאמתות אלמונית" #: ../data/gui/accounts_window.ui.h:8 -msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)" -msgstr "משאב נשלח אל שרת Jabber בכדי להפריד את אותה כתובת JID בשני חלקים או יותר, בהסתמך על מספר הלקוחות שמחוברים אל אותו השרת עם אותו החשבון. כך שייתכן שתהיה מחובר אל אותו החשבון עם משאב 'בית' וגם 'עבודה' בו זמנית. המשאב לו נתונה העדיפות הגבוהה ביותר יקבל את האירועים. (ראו למטה)" +msgid "" +"Resource is sent to the Jabber server in order to separate the same JID in " +"two or more parts depending on the number of the clients connected in the " +"same server with the same account. So you might be connected in the same " +"account with resource 'Home' and 'Work' at the same time. The resource which " +"has the highest priority will get the events. (see below)" +msgstr "" +"משאב נשלח אל שרת Jabber בכדי להפריד את אותה כתובת JID בשני חלקים או יותר, " +"בהסתמך על מספר הלקוחות שמחוברים אל אותו השרת עם אותו החשבון. כך שייתכן שתהיה " +"מחובר אל אותו החשבון עם משאב 'בית' וגם 'עבודה' בו זמנית. המשאב לו נתונה " +"העדיפות הגבוהה ביותר יקבל את האירועים. (ראו למטה)" # In Hebrew: גאג'ים #. No configured account -#: ../data/gui/accounts_window.ui.h:9 -#: ../data/gui/roster_window.ui.h:1 -#: ../data/gajim.desktop.in.in.h:1 -#: ../src/common/helpers.py:1168 -#: ../src/common/helpers.py:1180 -#: ../src/notify.py:316 -#: ../src/notify.py:339 -#: ../src/notify.py:389 -#: ../src/notify.py:405 +#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1 +#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168 +#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339 +#: ../src/notify.py:389 ../src/notify.py:405 msgid "Gajim" msgstr "‫Gajim" @@ -283,7 +267,7 @@ #: ../data/gui/accounts_window.ui.h:11 msgid "Click to request authorization to all contacts of another account" -msgstr "לחץ בכדי לבקש הרשאות עבור כל אנשי קשר של בחשבון אחר" +msgstr "לחץ בכדי לבקש הרשאות עבור כל אנשי קשר של חשבון אחר" #: ../data/gui/accounts_window.ui.h:12 msgid "Chan_ge Password" @@ -302,8 +286,14 @@ # BUG: from a jabber "the" # שני לקוחות ומעלה #: ../data/gui/accounts_window.ui.h:15 -msgid "Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events" -msgstr "עדיפת משמשת אצל Jabber כדי לקבוע מי מקבל את האירועים מן שרת jabber כאשר שני לקוחות או יותר מחוברים באמצעות אותו החשבון; הלקוח בעל העדיפות הגבוהה ביותר יקבל את האירועים" +msgid "" +"Priority is used in Jabber to determine who gets the events from the jabber " +"server when two or more clients are connected using the same account; The " +"client with the highest priority gets the events" +msgstr "" +"עדיפת משמשת אצל Jabber כדי לקבוע מי מקבל את האירועים מן שרת jabber כאשר שני " +"לקוחות או יותר מחוברים באמצעות אותו החשבון; הלקוח בעל העדיפות הגבוהה ביותר " +"יקבל את האירועים" #: ../data/gui/accounts_window.ui.h:16 msgid "A_djust to status" @@ -351,8 +341,12 @@ # BUG: a dot at the end # כאשר ישוגר #: ../data/gui/accounts_window.ui.h:30 -msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account" -msgstr "במידה ואפשרות זו מסומנת, Gajim, בעת שיגור, יתחבר אוטומטית אל jabber באמצעות חשבון זה" +msgid "" +"If checked, Gajim, when launched, will automatically connect to jabber using " +"this account" +msgstr "" +"במידה ואפשרות זו מסומנת, Gajim, בעת שיגור, יתחבר אוטומטית אל jabber באמצעות " +"חשבון זה" # BUG: _underline # במידה והחיבור @@ -377,8 +371,13 @@ # תיבת קומבינה (קומבינציה) # תיבת שיח #: ../data/gui/accounts_window.ui.h:34 -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 accordingly" -msgstr "במידה ואפשרות זו מסומנת, כל שינוי אל מצב־החיבור הגלובלי (מטופל על ידי תיבת־הבחירה שמצויה בתחתית חלון הרשימה) ישנה את המצב של חשבון זה בהתאמה" +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 " +"accordingly" +msgstr "" +"במידה ואפשרות זו מסומנת, כל שינוי אל מצב החיבור הגלובלי (מטופל על ידי תיבת־" +"הבחירה שמצויה בתחתית חלון הרשימה) ישנה את המצב של חשבון זה בהתאמה" # BUG: _underline #: ../data/gui/accounts_window.ui.h:35 @@ -387,21 +386,21 @@ # שיהיו סיכויים גדולים יותר להעברת קובץ לעבוד #: ../data/gui/accounts_window.ui.h:36 -msgid "If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working." -msgstr "במידה ואפשרות זו מסומנת, Gajim ישדר, בנוסף לכתובת פרוטוקול המרשתת (IP) שלך, מספר כתובות IP נוספות, כך שלהעברת קובץ יהיו סיכויים גדולים יותר לעבוד." +msgid "" +"If checked, Gajim will also broadcast some more IPs except from just your " +"IP, so file transfer has higher chances of working." +msgstr "" +"במידה ואפשרות זו מסומנת, Gajim ישדר, בנוסף לכתובת פרוטוקול המרשתת (IP) שלך, " +"מספר כתובות IP נוספות, כך שלהעברת קובץ יהיו סיכויים גדולים יותר לעבוד." # אכן, זוהי קבוצה כללית. נא לא להפוך זאת באופן שרירותי ל"רישום" כללי או לכל מילה אחר שלא קשורה אל התוכנית #. FIXME: Ugly workaround. #. 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:37 -#: ../data/gui/preferences_window.ui.h:46 -#: ../src/common/contacts.py:135 -#: ../src/dialogs.py:113 -#: ../src/dialogs.py:125 -#: ../src/roster_window.py:3156 -#: ../src/roster_window.py:4284 +#: ../data/gui/accounts_window.ui.h:37 ../data/gui/preferences_window.ui.h:46 +#: ../src/common/contacts.py:135 ../src/dialogs.py:113 ../src/dialogs.py:125 +#: ../src/roster_window.py:3156 ../src/roster_window.py:4284 #: ../src/roster_window.py:5894 msgid "General" msgstr "כללית" @@ -410,10 +409,9 @@ msgid "_use HTTP__PROXY environment variable" msgstr "השתמש במשת_ני סביבת HTTP__PROXY" -#: ../data/gui/accounts_window.ui.h:39 -#: ../data/gui/preferences_window.ui.h:137 +#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:137 msgid "_Manage..." -msgstr " ניהו_ל... " +msgstr " נה_ל... " #: ../data/gui/accounts_window.ui.h:40 msgid "Proxy" @@ -424,8 +422,12 @@ msgstr "ה_זהר אותי לפני שימוש בחיבור לא מאובטח" #: ../data/gui/accounts_window.ui.h:42 -msgid "Check this so Gajim will ask you before sending your password over an insecure connection." -msgstr "סמנו את אפשרות זו כדי ש־Gajim ישאל אותך טרם שליחת סיסמתך על פני חיבור לא מאובטח." +msgid "" +"Check this so Gajim will ask you before sending your password over an " +"insecure connection." +msgstr "" +"סמן את אפשרות זו כדי ש־Gajim ישאל אותך טרם שליחת סיסמתך על פני חיבור לא " +"מאובטח." # חבילות נתונים מסוג #: ../data/gui/accounts_window.ui.h:43 @@ -434,13 +436,17 @@ # BUG: a dot at the end #: ../data/gui/accounts_window.ui.h:44 -msgid "If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection" -msgstr "במידה ואפשרות זו מסומנת, Gajim ישלח חבילות keep-alive כדי למנוע פקיעת זמן של חיבור (connection timeout) המביאה לידי ניתוק" - -# התאמה של שם +msgid "" +"If checked, Gajim will send keep-alive packets to prevent connection timeout " +"which results in disconnection"

1 0

gajim: fix xhtml
by Denis Fomin 06 Jan '13

06 Jan '13

changeset 5e9496f6ab87 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5e9496f6ab87 description: fix xhtml diffstat: src/conversation_textview.py | 2 +- src/htmltextview.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diffs (25 lines): diff -r 3e9c81e39c0e -r 5e9496f6ab87 src/conversation_textview.py --- a/src/conversation_textview.py Sun Jan 06 03:57:53 2013 +0400 +++ b/src/conversation_textview.py Sun Jan 06 12:35:10 2013 +0400 @@ -1363,7 +1363,7 @@ try: if name and (text.startswith('/me ') or text.startswith('/me\n')): xhtml = xhtml.replace('/me', '* %s' % (name,), 1) - self.tv.display_html(xhtml.encode('utf-8'), self) + self.tv.display_html(xhtml, self) return except Exception as e: gajim.log.debug('Error processing xhtml' + str(e)) diff -r 3e9c81e39c0e -r 5e9496f6ab87 src/htmltextview.py --- a/src/htmltextview.py Sun Jan 06 03:57:53 2013 +0400 +++ b/src/htmltextview.py Sun Jan 06 12:35:10 2013 +0400 @@ -525,7 +525,8 @@ # The "data" URL scheme http://tools.ietf.org/html/rfc2397 import base64 img = attrs['src'].split(',')[1] - mem = base64.standard_b64decode(urllib.parse.unquote(img)) + mem = base64.standard_b64decode(urllib.parse.unquote( + img).encode('utf-8')) elif loaded is not None: (mem, alt, replace_mark) = loaded update = True

1 0

gajim: fix make color string
by Denis Fomin 05 Jan '13

05 Jan '13

changeset 3e9c81e39c0e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3e9c81e39c0e description: fix make color string diffstat: src/gtkgui_helpers.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 52610a187771 -r 3e9c81e39c0e src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Sat Jan 05 23:06:59 2013 +0100 +++ b/src/gtkgui_helpers.py Sun Jan 06 03:57:53 2013 +0400 @@ -641,7 +641,8 @@ """ col = '#' for i in ('red', 'green', 'blue'): - h = hex(getattr(color, i) / (16*16)).split('x')[1] + h = hex(int(getattr(color, i) / (16*16))) + h = h.split('x')[1] if len(h) == 1: h = '0' + h col += h

1 0

gajim: fix encoding issue
by Yann Leboulanger 05 Jan '13

05 Jan '13

changeset 52610a187771 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=52610a187771 description: fix encoding issue diffstat: src/common/helpers.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 9e76c3f981ad -r 52610a187771 src/common/helpers.py --- a/src/common/helpers.py Sun Jan 06 00:20:50 2013 +0400 +++ b/src/common/helpers.py Sat Jan 05 23:06:59 2013 +0100 @@ -552,8 +552,8 @@ """ # 48 is the limit if len(filename) > 48: - hash = hashlib.md5(filename) - filename = base64.b64encode(hash.digest()) + hash = hashlib.md5(filename.encode('utf-8')) + filename = base64.b64encode(hash.digest()).decode('utf-8') # make it latin chars only filename = punycode_encode(filename).decode('utf-8')

1 0

gajim: fix showing emoticons
by Denis Fomin 05 Jan '13

05 Jan '13

changeset 9e76c3f981ad in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9e76c3f981ad description: fix showing emoticons diffstat: src/conversation_textview.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 6f41534b0718 -r 9e76c3f981ad src/conversation_textview.py --- a/src/conversation_textview.py Sat Jan 05 22:10:57 2013 +0400 +++ b/src/conversation_textview.py Sun Jan 06 00:20:50 2013 +0400 @@ -75,7 +75,7 @@ self._selected = False self._disconnect_funcs = [] self.connect('parent-set', self.on_parent_set) - self.connect('expose-event', self.on_expose) + self.connect('draw', self.on_expose) self.set_tooltip_text(text) self.anchor.set_data('plaintext', text) @@ -1087,7 +1087,7 @@ img = TextViewImage(anchor, special_text) animations = gajim.interface.emoticons_animations if not emot_ascii in animations: - animations[emot_ascii] = GdkPixbuf.PixbufAnimation( + animations[emot_ascii] = GdkPixbuf.PixbufAnimation.new_from_file( gajim.interface.emoticons[emot_ascii]) img.set_from_animation(animations[emot_ascii]) img.show()

1 0

gajim: correctly set_type_hint
by Denis Fomin 05 Jan '13

05 Jan '13

changeset 6f41534b0718 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6f41534b0718 description: correctly set_type_hint diffstat: src/dialogs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 9b291f86087e -r 6f41534b0718 src/dialogs.py --- a/src/dialogs.py Sat Jan 05 11:26:22 2013 +0100 +++ b/src/dialogs.py Sat Jan 05 22:10:57 2013 +0400 @@ -2806,7 +2806,7 @@ xml = gtkgui_helpers.get_gtk_builder('popup_notification_window.ui') self.window = xml.get_object('popup_notification_window') - self.set_type_hint(Gdk.WindowTypeHint.TOOLTIP) + self.window.set_type_hint(Gdk.WindowTypeHint.TOOLTIP) close_button = xml.get_object('close_button') event_type_label = xml.get_object('event_type_label') event_description_label = xml.get_object('event_description_label')

1 0

python-nbxmpp: don't call send when there is nothing to send
by Yann Leboulanger 05 Jan '13

05 Jan '13

changeset 38f275539555 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=38f275539555 description: don't call send when there is nothing to send diffstat: nbxmpp/transports_nb.py | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diffs (14 lines): diff -r 8f807ee11647 -r 38f275539555 nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Sat Jan 05 17:18:32 2013 +0100 +++ b/nbxmpp/transports_nb.py Sat Jan 05 17:19:37 2013 +0100 @@ -546,9 +546,7 @@ if send_count: sent_data = self.sendbuff[:send_count] self.sendbuff = self.sendbuff[send_count:] - self._plug_idle( - writable=((self.sendqueue!=[]) or (self.sendbuff!='')), - readable=True) + self._plug_idle(writable=(self.sendqueue != []), readable=True) self.raise_event(DATA_SENT, sent_data.decode('utf-8')) except Exception:

1 0

python-nbxmpp: don't crash when we sent a partial stanza that cu...
by Yann Leboulanger 05 Jan '13

05 Jan '13

changeset d971d36bbdd3 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=d971d36bbdd3 description: don't crash when we sent a partial stanza that cut utf-8 chars in the middle diffstat: nbxmpp/transports_nb.py | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diffs (35 lines): diff -r 38f275539555 -r d971d36bbdd3 nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Sat Jan 05 17:19:37 2013 +0100 +++ b/nbxmpp/transports_nb.py Sat Jan 05 17:24:18 2013 +0100 @@ -306,6 +306,7 @@ # bytes remained from the last send message self.sendbuff = '' + self.sent_bytes_buff = b'' # bytes remained from the last received message self.received_bytes_buff = b'' @@ -547,7 +548,22 @@ sent_data = self.sendbuff[:send_count] self.sendbuff = self.sendbuff[send_count:] self._plug_idle(writable=(self.sendqueue != []), readable=True) - self.raise_event(DATA_SENT, sent_data.decode('utf-8')) + + if self.sent_bytes_buff: + sent_data = self.sent_bytes_buff + sent_data + self.sent_bytes_buff = b'' + # try to decode sent data + try: + sent_data = sent_data.decode('utf-8') + except UnicodeDecodeError: + for i in range(-1, -4, -1): + char = sent_data[i] + if char & 0xc0 == 0xc0: + self.sent_bytes_buff = sent_data[i:] + sent_data = sent_data[:i] + break + sent_data = sent_data.decode('utf-8') + self.raise_event(DATA_SENT, sent_data) except Exception: log.error('_do_send:', exc_info=True)

1 0

python-nbxmpp: rename variable
by Yann Leboulanger 05 Jan '13

05 Jan '13

changeset 8f807ee11647 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=8f807ee11647 description: rename variable diffstat: nbxmpp/transports_nb.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diffs (34 lines): diff -r a41ef78ebb4c -r 8f807ee11647 nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Sat Jan 05 17:05:24 2013 +0100 +++ b/nbxmpp/transports_nb.py Sat Jan 05 17:18:32 2013 +0100 @@ -308,7 +308,7 @@ self.sendbuff = '' # bytes remained from the last received message - self.receivedbuff = b'' + self.received_bytes_buff = b'' self.proxy_dict = proxy_dict self.on_remote_disconnect = self.disconnect @@ -603,9 +603,9 @@ self.renew_send_timeout() self.renew_send_timeout2() - if self.receivedbuff: - received = self.receivedbuff + received - self.receivedbuff = b'' + if self.received_bytes_buff: + received = self.received_bytes_buff + received + self.received_bytes_buff = b'' # try to decode data try: @@ -614,7 +614,7 @@ for i in range(-1, -4, -1): char = received[i] if char & 0xc0 == 0xc0: - self.receivedbuff = received[i:] + self.received_bytes_buff = received[i:] received = received[:i] break received = received.decode('utf-8')

1 0

python-nbxmpp: don't crash when we get a partial stanza that cut...
by Yann Leboulanger 05 Jan '13

05 Jan '13

changeset a41ef78ebb4c in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=a41ef78ebb4c description: don't crash when we get a partial stanza that cut utf-8 chars in the middle diffstat: nbxmpp/client_nb.py | 7 +++---- nbxmpp/dispatcher_nb.py | 4 ++-- nbxmpp/transports_nb.py | 22 +++++++++++++++++++++- 3 files changed, 26 insertions(+), 7 deletions(-) diffs (79 lines): diff -r 928fa60a9d79 -r a41ef78ebb4c nbxmpp/client_nb.py --- a/nbxmpp/client_nb.py Sat Jan 05 10:17:56 2013 +0100 +++ b/nbxmpp/client_nb.py Sat Jan 05 17:05:24 2013 +0100 @@ -334,10 +334,9 @@ self.Dispatcher.ProcessNonBlocking(data) self.ip_addresses = [] if not hasattr(self, 'Dispatcher') or \ - self.Dispatcher.Stream._document_attrs is None: - self._xmpp_connect_machine( - mode='FAILURE', - data='Error on stream open') + self.Dispatcher.Stream._document_attrs is None: + self._xmpp_connect_machine(mode='FAILURE', + data='Error on stream open') return # if terminating stanza was received after init request then client gets diff -r 928fa60a9d79 -r a41ef78ebb4c nbxmpp/dispatcher_nb.py --- a/nbxmpp/dispatcher_nb.py Sat Jan 05 10:17:56 2013 +0100 +++ b/nbxmpp/dispatcher_nb.py Sat Jan 05 17:05:24 2013 +0100 @@ -112,7 +112,7 @@ r += '|' + c r += '|' + chr(ord(c) + 1) - self.invalid_chars_re = re.compile(r.encode('utf-8')) + self.invalid_chars_re = re.compile(r) def getAnID(self): global outgoingID @@ -200,7 +200,7 @@ % (tag, ns)) def replace_non_character(self, data): - return re.sub(self.invalid_chars_re, '\ufffd'.encode('utf-8'), data) + return re.sub(self.invalid_chars_re, '\ufffd', data) def ProcessNonBlocking(self, data): """ diff -r 928fa60a9d79 -r a41ef78ebb4c nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Sat Jan 05 10:17:56 2013 +0100 +++ b/nbxmpp/transports_nb.py Sat Jan 05 17:05:24 2013 +0100 @@ -307,6 +307,9 @@ # bytes remained from the last send message self.sendbuff = '' + # bytes remained from the last received message + self.receivedbuff = b'' + self.proxy_dict = proxy_dict self.on_remote_disconnect = self.disconnect @@ -599,9 +602,26 @@ self.remove_timeout() self.renew_send_timeout() self.renew_send_timeout2() + + if self.receivedbuff: + received = self.receivedbuff + received + self.receivedbuff = b'' + + # try to decode data + try: + received = received.decode('utf-8') + except UnicodeDecodeError: + for i in range(-1, -4, -1): + char = received[i] + if char & 0xc0 == 0xc0: + self.receivedbuff = received[i:] + received = received[:i] + break + received = received.decode('utf-8') + # pass received data to owner if self.on_receive: - self.raise_event(DATA_RECEIVED, received.decode('utf-8')) + self.raise_event(DATA_RECEIVED, received) self._on_receive(received) else: # This should never happen, so we need the debug.

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