Commits

commits@gajim.org

17632 discussions

[Git][gajim/python-nbxmpp][master] DiscoInfo: Add has_category() method
by Philipp Hörist 18 Apr '20

18 Apr '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 0dc661b5 by lovetox at 2020-04-18T09:50:12+02:00 DiscoInfo: Add has_category() method - - - - - 1 changed file: - nbxmpp/structs.py Changes: ===================================== nbxmpp/structs.py ===================================== @@ -372,6 +372,12 @@ class DiscoInfo(namedtuple('DiscoInfo', 'stanza identities features dataforms ti return identity.type return None + def has_category(self, category): + for identity in self.identities: + if identity.category == category: + return True + return False + @property def httpupload_max_file_size(self): size = self.get_field_value(NS_HTTPUPLOAD_0, 'max-file-size') View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/0dc661b5b969ee22da403eb6… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/0dc661b5b969ee22da403eb6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Disable unsupported status icon on wayland
by Philipp Hörist 17 Apr '20

17 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: bdf630ce by André Apitzsch at 2020-04-17T20:10:12+02:00 Disable unsupported status icon on wayland - - - - - 2 changed files: - gajim/gtk/preferences.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/preferences.py ===================================== @@ -690,16 +690,13 @@ class Preferences(Gtk.ApplicationWindow): active = widget.get_active() if active == 0: app.config.set('trayicon', 'never') - app.interface.systray_enabled = False - app.interface.systray.hide_icon() + app.interface.hide_systray() elif active == 1: app.config.set('trayicon', 'on_event') - app.interface.systray_enabled = True - app.interface.systray.show_icon() + app.interface.show_systray() else: app.config.set('trayicon', 'always') - app.interface.systray_enabled = True - app.interface.systray.show_icon() + app.interface.show_systray() def on_event_received_combobox_changed(self, widget): active = widget.get_active() ===================================== gajim/gui_interface.py ===================================== @@ -76,6 +76,7 @@ from gajim.common.structs import MUCData from gajim.common.nec import NetworkEvent from gajim.common.i18n import _ from gajim.common.client import Client +from gajim.common.const import Display from gajim.common.file_props import FilesProp @@ -1828,12 +1829,14 @@ class Interface: return False def show_systray(self): - self.systray_enabled = True - self.systray.show_icon() + if not app.is_display(Display.WAYLAND): + self.systray_enabled = True + self.systray.show_icon() def hide_systray(self): - self.systray_enabled = False - self.systray.hide_icon() + if not app.is_display(Display.WAYLAND): + self.systray_enabled = False + self.systray.hide_icon() def process_connections(self): """ @@ -2159,8 +2162,9 @@ class Interface: self.systray_enabled = False - from gajim.gtk import statusicon - self.systray = statusicon.StatusIcon() + if not app.is_display(Display.WAYLAND): + from gajim.gtk import statusicon + self.systray = statusicon.StatusIcon() # Init emoji_chooser from gajim.gtk.emoji_chooser import emoji_chooser View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bdf630ce9c2e425d0812fdc0f41455c9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bdf630ce9c2e425d0812fdc0f41455c9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] JID: Return correct bare jid
by Philipp Hörist 17 Apr '20

17 Apr '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 0783d913 by lovetox at 2020-04-17T10:45:01+02:00 JID: Return correct bare jid - - - - - 1 changed file: - nbxmpp/protocol.py Changes: ===================================== nbxmpp/protocol.py ===================================== @@ -895,12 +895,16 @@ class JID: """ Return the bare representation of JID. I.e. string value w/o resource """ + if not self.node: + return self.domain return '%s@%s' % (self.node, self.domain) def getBare(self): """ Return the bare representation of JID. I.e. string value w/o resource """ + if not self.node: + return self.domain return '%s@%s' % (self.node, self.domain) def setBare(self): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/0783d91395d7441f9a0abb4a… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/0783d91395d7441f9a0abb4a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Return correct type when calling parse_jid()
by Philipp Hörist 16 Apr '20

16 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: fcd3efb3 by lovetox at 2020-04-16T19:06:01+02:00 Return correct type when calling parse_jid() Fixes #10061 - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -102,7 +102,7 @@ class InvalidFormat(Exception): def parse_jid(jidstring): try: - return validate_jid(jidstring) + return str(validate_jid(jidstring)) except Exception as error: raise InvalidFormat(error) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fcd3efb39b0f8fe322e13eebb3d95df2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fcd3efb39b0f8fe322e13eebb3d95df2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: TCP: Add debug logging for keepalive timer
by Philipp Hörist 16 Apr '20

16 Apr '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: eab25fc9 by lovetox at 2020-04-16T14:39:06+02:00 TCP: Add debug logging for keepalive timer - - - - - 136dfd21 by lovetox at 2020-04-16T16:38:38+02:00 TCP: Refactor write async callback - - - - - 1 changed file: - nbxmpp/tcp.py Changes: ===================================== nbxmpp/tcp.py ===================================== @@ -143,11 +143,15 @@ class TCPConnection(Connection): def _remove_keepalive_timer(self): if self._keepalive_id is not None: + self._log.info('Remove keepalive timer') GLib.source_remove(self._keepalive_id) self._keepalive_id = None def _renew_keepalive_timer(self): + if self._con is None: + return self._remove_keepalive_timer() + self._log.info('Add keepalive timer') self._keepalive_id = GLib.timeout_add_seconds(5, self._send_keepalive) def _send_keepalive(self): @@ -280,22 +284,19 @@ class TCPConnection(Connection): self._log.error('Write Error: %s', error) return - self._renew_keepalive_timer() - data = data.decode() + self._log_stanza(data, received=False) + if data == ' ': # keepalive whitespace - if self._write_queue: - self._write_stanzas() - return - - self._log_stanza(data, received=False) + self._renew_keepalive_timer() - for stanza in self._write_stanza_buffer: - try: - self.notify('data-sent', stanza) - except Exception: - self._log.exception('Error while executing data-sent:') + else: + for stanza in self._write_stanza_buffer: + try: + self.notify('data-sent', stanza) + except Exception: + self._log.exception('Error while executing data-sent:') if self._output_closed and not self._write_queue: self._check_for_shutdown() @@ -363,3 +364,4 @@ class TCPConnection(Connection): super().destroy() self._con = None self._client = None + self._write_queue = None View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/857ab2bb5ee89d00e747ea8… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/857ab2bb5ee89d00e747ea8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] HtmlTextView: Add comment
by Philipp Hörist 16 Apr '20

16 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9af13bd0 by lovetox at 2020-04-16T14:15:54+02:00 HtmlTextView: Add comment - - - - - 1 changed file: - gajim/gtk/htmltextview.py Changes: ===================================== gajim/gtk/htmltextview.py ===================================== @@ -957,6 +957,8 @@ class HtmlTextView(Gtk.TextView): parser = xml.sax.make_parser() parser.setContentHandler(HtmlHandler(textview, conv_textview, eob)) parser.parse(StringIO(html)) + # If the xhtml ends with a BLOCK element we have to remove + # the \n we add after BLOCK elements self._delete_last_char(buffer_, eob) @staticmethod View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9af13bd0bddb94453de8e4030699c79f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9af13bd0bddb94453de8e4030699c79f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Test: Fix some some examples in htmltextview
by Philipp Hörist 16 Apr '20

16 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1ca2714a by lovetox at 2020-04-16T11:43:55+02:00 Test: Fix some some examples in htmltextview - - - - - bde886a9 by lovetox at 2020-04-16T14:13:38+02:00 HtmlTextView: Only delete newlines after displaying xhtml - - - - - 2 changed files: - gajim/gtk/htmltextview.py - test/gtk/htmltextview.py Changes: ===================================== gajim/gtk/htmltextview.py ===================================== @@ -963,7 +963,9 @@ class HtmlTextView(Gtk.TextView): def _delete_last_char(buffer_, iter_): start_iter = iter_.copy() start_iter.backward_char() - buffer_.delete(start_iter, iter_) + text = buffer_.get_text(start_iter, iter_, True) + if text == '\n': + buffer_.delete(start_iter, iter_) @staticmethod def _on_copy_clipboard(textview): ===================================== test/gtk/htmltextview.py ===================================== @@ -21,10 +21,6 @@ app.interface = Interface() XHTML = [ - ''' - <body xmlns='http://www.w3.org/1999/xhtml'>rexxnor: i nimes chum a...</body> - ''', - ''' <div> Hello @@ -33,7 +29,6 @@ XHTML = [ \n World\n </div> - \n ''', ''' @@ -42,19 +37,23 @@ XHTML = [ ''' <body xmlns='http://www.w3.org/1999/xhtml'> - a:b - <a href='http://google.com/' xmlns='http://www.w3.org/1999/xhtml'>Google</a> + Look here + <a href='http://google.com/'>Google</a> </body> ''', + ''' + <hr /> + ''', + ''' <body xmlns='http://www.w3.org/1999/xhtml'> O MG - , I'm greenwith + , I'm green with envy! </body> @@ -66,18 +65,11 @@ XHTML = [ ''' <body xmlns='http://www.w3.org/1999/xhtml'> - http://test.com/ testing links autolinkifying - </body> - ''', - - ''' - <hr /> - ''', - - ''' - <body xmlns='http://www.w3.org/1999/xhtml'> - As Emerson said in his essay Self-Reliance: + + As Emerson said in his essay + + Self-Reliance: + "A foolish consistency is the hobgoblin of little minds." @@ -176,7 +168,6 @@ XHTML = [ ''' <body xmlns='http://www.w3.org/1999/xhtml'> - <img src='data:image/png;base64,R0lGODdhMAAwAPAAAAAAAP///ywAAAAAMAAw\ AAAC8IyPqcvt3wCcDkiLc7C0qwyGHhSWpjQu5yqmCYsapyuvUUlvONmOZtfzgFz\ ByTB10QgxOR0TqBQejhRNzOfkVJ+5YiUqrXF5Y5lKh/DeuNcP5yLWGsEbtLiOSp\ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/bc72da81fccf15add0bd14a61982173… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/bc72da81fccf15add0bd14a61982173… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Revert "NodeBuilder: Don't add empty strings to cdata list"
by Philipp Hörist 15 Apr '20

15 Apr '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 857ab2bb by Philipp Hörist at 2020-04-15T20:27:40+02:00 Revert "NodeBuilder: Don't add empty strings to cdata list" This reverts commit 96961854ec58dff104eb67267424c6b7bc1ba2ba - - - - - 1 changed file: - nbxmpp/simplexml.py Changes: ===================================== nbxmpp/simplexml.py ===================================== @@ -625,6 +625,8 @@ class NodeBuilder: except ValueError as e: self._document_attrs = None raise ValueError(str(e)) + if not self.last_is_data and self._ptr.parent: + self._ptr.parent.data.append('') self.last_is_data = 0 def _check_stream_start(self, ns, tag): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/857ab2bb5ee89d00e747ea89… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/857ab2bb5ee89d00e747ea89… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove usage of stringprepare
by Philipp Hörist 13 Apr '20

13 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: bc72da81 by lovetox at 2020-04-13T20:04:00+02:00 Remove usage of stringprepare It was removed from nbxmpp - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -59,7 +59,6 @@ from encodings.punycode import punycode_encode from functools import wraps import nbxmpp -from nbxmpp.stringprepare import nameprep from nbxmpp.const import Role from nbxmpp.const import ConnectionProtocol from nbxmpp.const import ConnectionType @@ -101,48 +100,11 @@ class InvalidFormat(Exception): pass -def decompose_jid(jidstring): - user = None - server = None - resource = None - - # Search for delimiters - user_sep = jidstring.find('@') - res_sep = jidstring.find('/') - - if user_sep == -1: - if res_sep == -1: - # host - server = jidstring - else: - # host/resource - server = jidstring[0:res_sep] - resource = jidstring[res_sep + 1:] - else: - if res_sep == -1: - # user@host - user = jidstring[0:user_sep] - server = jidstring[user_sep + 1:] - else: - if user_sep < res_sep: - # user@host/resource - user = jidstring[0:user_sep] - server = jidstring[user_sep + 1:user_sep + (res_sep - user_sep)] - resource = jidstring[res_sep + 1:] - else: - # server/resource (with an @ in resource) - server = jidstring[0:res_sep] - resource = jidstring[res_sep + 1:] - return user, server, resource - def parse_jid(jidstring): - """ - Perform stringprep on all JID fragments from a string and return the full - jid - """ - # This function comes from http://svn.twistedmatrix.com/cvs/trunk/twisted/words/protocols/jabber/jid.py - - return prep(*decompose_jid(jidstring)) + try: + return validate_jid(jidstring) + except Exception as error: + raise InvalidFormat(error) def idn_to_ascii(host): """ @@ -193,71 +155,6 @@ def parse_resource(resource): except UnicodeError: raise InvalidFormat('Invalid character in resource.') -def prep(user, server, resource): - """ - Perform stringprep on all JID fragments and return the full jid - """ - # This function comes from - #http://svn.twistedmatrix.com/cvs/trunk/twisted/words/protocols/jabber/jid.py - - ip_address = False - - try: - socket.inet_aton(server) - ip_address = True - except socket.error: - pass - - if not ip_address and hasattr(socket, 'inet_pton'): - try: - socket.inet_pton(socket.AF_INET6, server.strip('[]')) - server = '[%s]' % server.strip('[]') - ip_address = True - except (socket.error, ValueError): - pass - - if not ip_address: - if server is not None: - if server.endswith('.'): # RFC7622, 3.2 - server = server[:-1] - if not server or len(server.encode('utf-8')) > 1023: - raise InvalidFormat(_('Server must be between 1 and 1023 bytes')) - try: - server = nameprep.prepare(server) - except UnicodeError: - raise InvalidFormat(_('Invalid character in hostname.')) - else: - raise InvalidFormat(_('Server address required.')) - - if user is not None: - if not user or len(user.encode('utf-8')) > 1023: - raise InvalidFormat(_('Username must be between 1 and 1023 bytes')) - try: - user = user.encode('UsernameCaseMapped').decode('utf-8') - except UnicodeError: - raise InvalidFormat(_('Invalid character in username.')) - else: - user = None - - if resource is not None: - if not resource or len(resource.encode('utf-8')) > 1023: - raise InvalidFormat(_('Resource must be between 1 and 1023 bytes')) - try: - resource = resource.encode('OpaqueString').decode('utf-8') - except UnicodeError: - raise InvalidFormat(_('Invalid character in resource.')) - else: - resource = None - - if user: - if resource: - return '%s@%s/%s' % (user, server, resource) - return '%s@%s' % (user, server) - - if resource: - return '%s/%s' % (server, resource) - return server - def windowsify(s): if os.name == 'nt': return s.capitalize() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bc72da81fccf15add0bd14a619821733… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bc72da81fccf15add0bd14a619821733… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Remove stringprepare module
by Philipp Hörist 13 Apr '20

13 Apr '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 6b3f7e09 by lovetox at 2020-04-13T19:58:35+02:00 Remove stringprepare module - - - - - 1d792d6c by lovetox at 2020-04-13T20:17:34+02:00 Protocol: Cache validation of JID parts - - - - - 2 changed files: - nbxmpp/protocol.py - − nbxmpp/stringprepare.py Changes: ===================================== nbxmpp/protocol.py ===================================== @@ -22,10 +22,11 @@ import time import hashlib import socket import functools +import stringprep from base64 import b64encode +from encodings import idna from precis_i18n import get_profile -from nbxmpp.stringprepare import nameprep from nbxmpp.simplexml import Node def ascii_upper(s): @@ -759,6 +760,7 @@ def parse_jid(jid): return localpart, domainpart, resourcepart +(a)functools.lru_cache(maxsize=32768) def validate_localpart(localpart): if not localpart or len(localpart.encode()) > 1023: raise LocalpartByteLimit @@ -773,6 +775,7 @@ def validate_localpart(localpart): raise LocalpartNotAllowedChar +(a)functools.lru_cache(maxsize=32768) def validate_resourcepart(resourcepart): if not resourcepart or len(resourcepart.encode()) > 1023: raise ResourcepartByteLimit @@ -784,6 +787,7 @@ def validate_resourcepart(resourcepart): raise ResourcepartNotAllowedChar +(a)functools.lru_cache(maxsize=4096) def validate_domainpart(domainpart): # Check if this is a IPV4 address try: @@ -807,7 +811,17 @@ def validate_domainpart(domainpart): domainpart = domainpart[:-1] try: - return nameprep.prepare(domainpart) + new_labels = [] + for label in idna.dots.split(domainpart): + new_label = idna.nameprep(label) + + # Check unassigned + if any(stringprep.in_table_a1(x) for x in new_label): + raise DomainpartNotAllowedChar + + new_labels.append(new_label) + + return ".".join(new_labels) except Exception: raise DomainpartNotAllowedChar ===================================== nbxmpp/stringprepare.py deleted ===================================== @@ -1,247 +0,0 @@ -# -*- coding:utf-8 -*- -## src/common/xmpp/stringprepare.py -## -## Copyright (C) 2001-2005 Twisted Matrix Laboratories -## Copyright (C) 2005-2012 Yann Leboulanger <asterix AT lagaule.org> -## Copyright (C) 2006 Stefan Bethge <stefan AT lanpartei.de> -## Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> -## -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -## - -import stringprep -import unicodedata -from encodings import idna - - -class ILookupTable: - """ - Interface for character lookup classes - """ - - def lookup(self, c): - """ - Return whether character is in this table - """ - - -class IMappingTable: - """ - Interface for character mapping classes - """ - - def map(self, c): - """ - Return mapping for character - """ - - -class LookupTableFromFunction: - __implements__ = ILookupTable - - def __init__(self, in_table_function): - self.lookup = in_table_function - - -class LookupTable: - __implements__ = ILookupTable - - def __init__(self, table): - self._table = table - - def lookup(self, c): - return c in self._table - - -class MappingTableFromFunction: - __implements__ = IMappingTable - - def __init__(self, map_table_function): - self.map = map_table_function - - -class EmptyMappingTable: - __implements__ = IMappingTable - - def __init__(self, in_table_function): - self._in_table_function = in_table_function - - def map(self, c): - if self._in_table_function(c): - return None - return c - - -class Profile: - def __init__(self, mappings=None, normalize=True, prohibiteds=None, - check_unassigneds=True, check_bidi=True): - if mappings is None: - self.mappings = [] - else: - self.mappings = mappings - - self.normalize = normalize - - if prohibiteds is None: - self.prohibiteds = [] - else: - self.prohibiteds = prohibiteds - - self.do_check_unassigneds = check_unassigneds - self.do_check_bidi = check_bidi - - def prepare(self, string): - result = self.map(string) - if self.normalize: - result = unicodedata.normalize("NFKC", result) - self.check_prohibiteds(result) - if self.do_check_unassigneds: - self.check_unassigneds(result) - if self.do_check_bidi: - self.check_bidirectionals(result) - return result - - def map(self, string): - result = [] - - for c in string: - result_c = c - - for mapping in self.mappings: - result_c = mapping.map(c) - if result_c != c: - break - - if result_c is not None: - result.append(result_c) - - return "".join(result) - - def check_prohibiteds(self, string): - for c in string: - for table in self.prohibiteds: - if table.lookup(c): - raise UnicodeError("Invalid character %s" % repr(c)) - - def check_unassigneds(self, string): - for c in string: - if stringprep.in_table_a1(c): - raise UnicodeError("Unassigned code point %s" % repr(c)) - - def check_bidirectionals(self, string): - found_LCat = False - found_RandALCat = False - - for c in string: - if stringprep.in_table_d1(c): - found_RandALCat = True - if stringprep.in_table_d2(c): - found_LCat = True - - if found_LCat and found_RandALCat: - raise UnicodeError("Violation of BIDI Requirement 2") - - if found_RandALCat and not (stringprep.in_table_d1(string[0]) and - stringprep.in_table_d1(string[-1])): - raise UnicodeError("Violation of BIDI Requirement 3") - - -class NamePrep: - """ - Implements preparation of internationalized domain names - - This class implements preparing internationalized domain names using the - rules defined in RFC 3491, section 4 (Conversion operations). - - We do not perform step 4 since we deal with unicode representations of - domain names and do not convert from or to ASCII representations using - punycode encoding. When such a conversion is needed, the L{idna} standard - library provides the C{ToUnicode()} and C{ToASCII()} functions. Note that - L{idna} itself assumes UseSTD3ASCIIRules to be false. - - The following steps are performed by C{prepare()}: - - * Split the domain name in labels at the dots (RFC 3490, 3.1) - * Apply nameprep proper on each label (RFC 3491) - * Enforce the restrictions on ASCII characters in host names by - assuming STD3ASCIIRules to be true. (STD 3) - * Rejoin the labels using the label separator U+002E (full stop). - """ - - # Prohibited characters. - prohibiteds = [chr(n) for n in list(range(0x00, 0x2c + 1)) + - list(range(0x2e, 0x2f + 1)) + - list(range(0x3a, 0x40 + 1)) + - list(range(0x5b, 0x60 + 1)) + - list(range(0x7b, 0x7f + 1)) ] - - def prepare(self, string): - result = [] - - labels = idna.dots.split(string) - - if labels and len(labels[-1]) == 0: - trailing_dot = '.' - del labels[-1] - else: - trailing_dot = '' - - for label in labels: - result.append(self.nameprep(label)) - - return ".".join(result)+trailing_dot - - def check_prohibiteds(self, string): - for c in string: - if c in self.prohibiteds: - raise UnicodeError("Invalid character %s" % repr(c)) - - def nameprep(self, label): - label = idna.nameprep(label) - self.check_prohibiteds(label) - if len(label) == 0: - raise UnicodeError("Invalid empty name") - if label[0] == '-': - raise UnicodeError("Invalid leading hyphen-minus") - if label[-1] == '-': - raise UnicodeError("Invalid trailing hyphen-minus") - return label - -C_11 = LookupTableFromFunction(stringprep.in_table_c11) -C_12 = LookupTableFromFunction(stringprep.in_table_c12) -C_21 = LookupTableFromFunction(stringprep.in_table_c21) -C_22 = LookupTableFromFunction(stringprep.in_table_c22) -C_3 = LookupTableFromFunction(stringprep.in_table_c3) -C_4 = LookupTableFromFunction(stringprep.in_table_c4) -C_5 = LookupTableFromFunction(stringprep.in_table_c5) -C_6 = LookupTableFromFunction(stringprep.in_table_c6) -C_7 = LookupTableFromFunction(stringprep.in_table_c7) -C_8 = LookupTableFromFunction(stringprep.in_table_c8) -C_9 = LookupTableFromFunction(stringprep.in_table_c9) - -B_1 = EmptyMappingTable(stringprep.in_table_b1) -B_2 = MappingTableFromFunction(stringprep.map_table_b2) - -nodeprep = Profile(mappings=[B_1, B_2], - prohibiteds=[C_11, C_12, C_21, C_22, - C_3, C_4, C_5, C_6, C_7, C_8, C_9, - LookupTable(['"', '&', "'", '/', - ':', '<', '>', '@'])]) - -resourceprep = Profile(mappings=[B_1,], - prohibiteds=[C_12, C_21, C_22, - C_3, C_4, C_5, C_6, C_7, C_8, C_9]) - -nameprep = NamePrep() View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/8016441c9981d48e14b5551… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/8016441c9981d48e14b5551… You're receiving this email because of your account on dev.gajim.org.

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