Commits April 2020

commits@gajim.org

1 participants
117 discussions

[Git][gajim/python-nbxmpp][master] CI: Parse more strictly with pylint
by Philipp Hörist 19 Apr '20

19 Apr '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 249548e7 by lovetox at 2020-04-19T11:41:16+02:00 CI: Parse more strictly with pylint - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -13,10 +13,26 @@ run-test: - virtualenv -p python3 --system-site-packages civenv-nbxmpp - . ./civenv-nbxmpp/bin/activate - pip3 install -I pylint==2.4.4 - - python3 -m pylint nbxmpp --disable=C0103,C0201,C0301,C0325,C0326,C0330,W0201,W0212,W0221,W0231,W0233,W0401,W0601,W0614,W0621,W0622,R0201,E1101,E1135 + - python3 -m pylint nbxmpp --disable=C0103,C0201,C0301,C0326,C0330,W0201,W0212,W0221,W0231,W0233,W0621,W0622,R0201,E1101,E1135 - deactivate - rm -rf civenv-nbxmpp +# C0103 invalid-name +# C0201 consider-iterating-dictionary +# C0301 line-too-long +# C0326 bad-whitespace +# C0330 bad-continuation +# W0201 attribute-defined-outside-init +# W0212 protected-access +# W0221 arguments-differ +# W0231 super-init-not-called +# W0233 non-parent-init-called +# W0621 redefined-outer-name +# W0622 redefined-builtin +# R0201 no-self-use +# E1101 no-member +# E1135 unsupported-membership-test + run-build: stage: build script: View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/249548e7a3c224f07c0aa66f… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/249548e7a3c224f07c0aa66f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 3 commits: Fix pylint errors
by Philipp Hörist 19 Apr '20

19 Apr '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 8cf45cbc by lovetox at 2020-04-19T10:38:55+02:00 Fix pylint errors - - - - - 3f1f5da5 by lovetox at 2020-04-19T10:57:28+02:00 Protocol: Remove comments - - - - - 277496eb by lovetox at 2020-04-19T11:19:41+02:00 Fix pylint errors - - - - - 3 changed files: - nbxmpp/idlequeue.py - nbxmpp/old_dispatcher.py - nbxmpp/protocol.py Changes: ===================================== nbxmpp/idlequeue.py ===================================== @@ -23,7 +23,7 @@ import errno import select import logging import time -log = logging.getLogger('nbxmpp.idlequeue') +import subprocess # needed for get_idleqeue try: @@ -32,30 +32,30 @@ try: except ImportError: HAVE_GLIB = False -# needed for idlecommand -if os.name == 'nt': - from subprocess import * # python24 only. we ask this for Windows -elif os.name == 'posix': + +if os.name == 'posix': import fcntl +log = logging.getLogger('nbxmpp.idlequeue') + if HAVE_GLIB: FLAG_WRITE = GLib.IOCondition.OUT | GLib.IOCondition.HUP - FLAG_READ = GLib.IOCondition.IN | GLib.IOCondition.PRI | \ - GLib.IOCondition.HUP + FLAG_READ = GLib.IOCondition.IN | GLib.IOCondition.PRI | \ + GLib.IOCondition.HUP FLAG_READ_WRITE = GLib.IOCondition.OUT | GLib.IOCondition.IN | \ GLib.IOCondition.PRI | GLib.IOCondition.HUP - FLAG_CLOSE = GLib.IOCondition.HUP - PENDING_READ = GLib.IOCondition.IN # There is data to read. - PENDING_WRITE = GLib.IOCondition.OUT # Data CAN be written without blocking - IS_CLOSED = GLib.IOCondition.HUP # Hung up (connection broken) + FLAG_CLOSE = GLib.IOCondition.HUP + PENDING_READ = GLib.IOCondition.IN # There is data to read. + PENDING_WRITE = GLib.IOCondition.OUT # Data CAN be written without blocking + IS_CLOSED = GLib.IOCondition.HUP # Hung up (connection broken) else: - FLAG_WRITE = 20 # write only 10100 - FLAG_READ = 19 # read only 10011 - FLAG_READ_WRITE = 23 # read and write 10111 - FLAG_CLOSE = 16 # wait for close 10000 - PENDING_READ = 3 # waiting read event 11 - PENDING_WRITE = 4 # waiting write event 100 - IS_CLOSED = 16 # channel closed 10000 + FLAG_WRITE = 20 # write only 10100 + FLAG_READ = 19 # read only 10011 + FLAG_READ_WRITE = 23 # read and write 10111 + FLAG_CLOSE = 16 # wait for close 10000 + PENDING_READ = 3 # waiting read event 11 + PENDING_WRITE = 4 # waiting write event 100 + IS_CLOSED = 16 # channel closed 10000 def get_idlequeue(): @@ -118,7 +118,9 @@ class IdleCommand(IdleObject): # if it is True, we can safetely execute the command self.canexecute = True self.idlequeue = None - self.result ='' + self.result = '' + self.endtime = None + self.pipe = None def set_idlequeue(self, idlequeue): self.idlequeue = idlequeue @@ -128,7 +130,8 @@ class IdleCommand(IdleObject): self.result_handler(self.result) self.result_handler = None - def _compose_command_args(self): + @staticmethod + def _compose_command_args(): return ['echo', 'da'] def _compose_command_line(self): @@ -167,15 +170,19 @@ class IdleCommand(IdleObject): def _start_nt(self): # if program is started from noninteraactive shells stdin is closed and # cannot be forwarded, so we have to keep it open - self.pipe = Popen(self._compose_command_args(), stdout=PIPE, - bufsize=1024, shell=True, stderr=STDOUT, stdin=PIPE) + self.pipe = subprocess.Popen(self._compose_command_args(), + stdout=subprocess.PIPE, + bufsize=1024, + shell=True, + stderr=subprocess.STDOUT, + stdin=subprocess.PIPE) if self.commandtimeout >= 0: self.endtime = self.idlequeue.current_time() + self.commandtimeout self.idlequeue.set_alarm(self.wait_child, 0.1) def _start_posix(self): self.pipe = os.popen(self._compose_command_line()) - self.fd = self.pipe.fileno() + self.fd = self.pipe.fileno() # pylint: disable=no-member fcntl.fcntl(self.pipe, fcntl.F_SETFL, os.O_NONBLOCK) self.idlequeue.plug_idle(self, False, True) if self.commandtimeout >= 0: @@ -195,7 +202,7 @@ class IdleCommand(IdleObject): def pollin(self): try: - res = self.pipe.read() + res = self.pipe.read() # pylint: disable=no-member except Exception: res = '' if res == '': @@ -286,11 +293,11 @@ class IdleQueue: if fd in self.read_timeouts: if timeout: if timeout in self.read_timeouts[fd]: - del(self.read_timeouts[fd][timeout]) + del self.read_timeouts[fd][timeout] if len(self.read_timeouts[fd]) == 0: - del(self.read_timeouts[fd]) + del self.read_timeouts[fd] else: - del(self.read_timeouts[fd]) + del self.read_timeouts[fd] def set_read_timeout(self, fd, seconds, func=None): """ @@ -339,7 +346,7 @@ class IdleQueue: for callback in self.alarms[alarm_time]: callback() if alarm_time in self.alarms: - del(self.alarms[alarm_time]) + del self.alarms[alarm_time] def plug_idle(self, obj, writable=True, readable=True): """ @@ -378,10 +385,11 @@ class IdleQueue: Remove plugged IdleObject, specified by filedescriptor fd """ if fd in self.queue: - del(self.queue[fd]) + del self.queue[fd] self._remove_idle(fd) - def current_time(self): + @staticmethod + def current_time(): return time.monotonic() def _remove_idle(self, fd): @@ -443,19 +451,19 @@ class SelectIdleQueue(IdleQueue): check if they're valid. Greatly improves performance if the caller hands us and expects notification on an invalid file handle. """ - bad_fds=[] - union={} + bad_fds = [] + union = {} union.update(self.write_fds) union.update(self.read_fds) union.update(self.error_fds) - for fd in (union.keys()): + for fd in union: try: _status = os.stat(fd) except OSError: # This file descriptor is invalid. Add to list for closure. bad_fds.append(fd) - for fd in (bad_fds): + for fd in bad_fds: obj = self.queue.get(fd) if obj is not None: self.remove_timeout(fd) @@ -486,36 +494,39 @@ class SelectIdleQueue(IdleQueue): Remove descriptor from read/write/error lists """ if fd in self.read_fds: - del(self.read_fds[fd]) + del self.read_fds[fd] if fd in self.write_fds: - del(self.write_fds[fd]) + del self.write_fds[fd] if fd in self.error_fds: - del(self.error_fds[fd]) + del self.error_fds[fd] def process(self): if not self.write_fds and not self.read_fds: self._check_time_events() return True try: - waiting_descriptors = select.select(list(self.read_fds.keys()), - list(self.write_fds.keys()), list(self.error_fds.keys()), 0) - except OSError as e: + waiting_descriptors = select.select( + list(self.read_fds.keys()), + list(self.write_fds.keys()), + list(self.error_fds.keys()), + 0) + except OSError as error: waiting_descriptors = ((), (), ()) - if e.errno != errno.EINTR: + if error.errno != errno.EINTR: self.checkQueue() raise for fd in waiting_descriptors[0]: - q = self.queue.get(fd) - if q: - q.pollin() + idle_object = self.queue.get(fd) + if idle_object: + idle_object.pollin() for fd in waiting_descriptors[1]: - q = self.queue.get(fd) - if q: - q.pollout() + idle_object = self.queue.get(fd) + if idle_object: + idle_object.pollout() for fd in waiting_descriptors[2]: - q = self.queue.get(fd) - if q: - q.pollend() + idle_object = self.queue.get(fd) + if idle_object: + idle_object.pollend() self._check_time_events() return True @@ -542,8 +553,10 @@ class GlibIdleQueue(IdleQueue): This method is called when we plug a new idle object. Start listening for events from fd """ - res = GLib.io_add_watch(fd, GLib.PRIORITY_LOW, flags, - self._process_events) + res = GLib.io_add_watch(fd, + GLib.PRIORITY_LOW, + flags, + self._process_events) # store the id of the watch, so that we can remove it on unplug self.events[fd] = res @@ -565,7 +578,7 @@ class GlibIdleQueue(IdleQueue): return GLib.source_remove(self.events[fd]) - del(self.events[fd]) + del self.events[fd] def process(self): self._check_time_events() ===================================== nbxmpp/old_dispatcher.py ===================================== @@ -99,10 +99,11 @@ class Dispatcher: is that reference used to access dispatcher instance is in Client attribute named by __class__.__name__ of the dispatcher instance .. long story short: - I wrote following to avoid changing each client.Dispatcher.whatever() in xmpp + I wrote following to avoid changing each client.Dispatcher.whatever() in + xmpp - If having two kinds of dispatcher will go well, I will rewrite the dispatcher - references in other scripts + If having two kinds of dispatcher will go well, I will rewrite the + dispatcher references in other scripts """ def PlugIn(self, client_obj, after_SASL=False, old_features=None): @@ -141,12 +142,13 @@ class XMPPDispatcher(PlugIn): self._pendingExceptions = [] self._eventHandler = None self._cycleHandlers = [] - self._exported_methods=[self.RegisterHandler, self.RegisterDefaultHandler, - self.RegisterEventHandler, self.UnregisterCycleHandler, - self.RegisterCycleHandler, self.RegisterHandlerOnce, - self.UnregisterHandler, self.RegisterProtocol, - self.SendAndCallForResponse, - self.getAnID, self.Event, self.send, self.get_module] + self._exported_methods = [ + self.RegisterHandler, self.RegisterDefaultHandler, + self.RegisterEventHandler, self.UnregisterCycleHandler, + self.RegisterCycleHandler, self.RegisterHandlerOnce, + self.UnregisterHandler, self.RegisterProtocol, + self.SendAndCallForResponse, + self.getAnID, self.Event, self.send, self.get_module] # \ufddo -> \ufdef range c = '\ufdd0' @@ -178,9 +180,9 @@ class XMPPDispatcher(PlugIn): def restoreHandlers(self, handlers): """ - Restore user-registered callbacks structure from dump previously obtained - via dumpHandlers. Used within the library to carry user handlers set over - Dispatcher replugins. + Restore user-registered callbacks structure from dump previously + obtained via dumpHandlers. Used within the library to carry user + handlers set over Dispatcher replugins. """ self.handlers = handlers @@ -288,12 +290,13 @@ class XMPPDispatcher(PlugIn): self._metastream.setAttr('xmlns:stream', NS_STREAMS) self._metastream.setAttr('to', self._owner.Server) self._metastream.setAttr('xml:lang', self._owner.lang) - self._owner.send("%s%s>" % (XML_DECLARATION, str(self._metastream)[:-2])) + self._owner.send("%s%s>" % (XML_DECLARATION, + str(self._metastream)[:-2])) def _check_stream_start(self, ns, tag, attrs): - if ns != NS_STREAMS or tag!='stream': - raise ValueError('Incorrect stream start: (%s,%s). Terminating.' - % (tag, ns)) + if ns != NS_STREAMS or tag != 'stream': + raise ValueError('Incorrect stream start: ' + '(%s,%s). Terminating.' % (tag, ns)) def replace_non_character(self, data): return re.sub(self.invalid_chars_re, '\ufffd', data) @@ -331,8 +334,8 @@ class XMPPDispatcher(PlugIn): log.error(error) self._owner.Connection.disconnect() return 0 - except ValueError as e: - log.debug('ValueError: %s', e) + except ValueError as error: + log.debug('ValueError: %s', error) self._owner.Connection.pollend() return 0 if len(self._pendingExceptions) > 0: @@ -380,10 +383,11 @@ class XMPPDispatcher(PlugIn): Register user callback as stanzas handler of declared type Callback arguments: - dispatcher instance (for replying), incoming return of previous handlers. - The callback must raise xmpp.NodeProcessed just before return if it wants - to prevent other callbacks to be called with the same stanza as argument - _and_, more importantly library from returning stanza to sender with error set. + dispatcher instance (for replying), incoming return of previous + handlers. The callback must raise xmpp.NodeProcessed just before return + if it wants to prevent other callbacks to be called with the same stanza + as argument _and_, more importantly library from returning + stanza to sender with error set. :param name: name of stanza. F.e. "iq". :param handler: user callback. @@ -468,8 +472,8 @@ class XMPPDispatcher(PlugIn): def RegisterEventHandler(self, handler): """ - Register handler that will process events. F.e. "FILERECEIVED" event. See - common/connection: _event_dispatcher() + Register handler that will process events. F.e. "FILERECEIVED" event. + See common/connection: _event_dispatcher() """ self._eventHandler = handler @@ -490,7 +494,8 @@ class XMPPDispatcher(PlugIn): def UnregisterCycleHandler(self, handler): """ - Unregister handler that will be called on every Dispatcher.Process() call + Unregister handler that will be called on every Dispatcher.Process() + call """ if handler in self._cycleHandlers: self._cycleHandlers.remove(handler) @@ -745,9 +750,9 @@ class BOSHDispatcher(XMPPDispatcher): children = stanza.getChildren() if children: for child in children: - # if child doesn't have any ns specified, simplexml (or expat) - # thinks it's of parent's (BOSH body) namespace, so we have to - # rewrite it to jabber:client + # if child doesn't have any ns specified, simplexml + # (or expat) thinks it's of parent's (BOSH body) namespace, + # so we have to rewrite it to jabber:client if child.getNamespace() == NS_HTTP_BIND: child.setNamespace(self._owner.defaultNamespace) XMPPDispatcher.dispatch(self, child) ===================================== nbxmpp/protocol.py ===================================== @@ -45,8 +45,8 @@ NS_ATOM = 'http://www.w3.org/2005/Atom' NS_ATTENTION = 'urn:xmpp:attention:0' # XEP-0224 NS_AUTH = 'jabber:iq:auth' NS_AVATAR = 'http://www.xmpp.org/extensions/xep-0084.html#ns-metadata' -NS_AVATAR_METADATA = 'urn:xmpp:avatar:metadata' # XEP-0084 -NS_AVATAR_DATA = 'urn:xmpp:avatar:data' # XEP-0084 +NS_AVATAR_METADATA = 'urn:xmpp:avatar:metadata' # XEP-0084 +NS_AVATAR_DATA = 'urn:xmpp:avatar:data' # XEP-0084 NS_BIND = 'urn:ietf:params:xml:ns:xmpp-bind' NS_BLOCKING = 'urn:xmpp:blocking' # XEP-0191 NS_BOB = 'urn:xmpp:bob' # XEP-0231 @@ -94,7 +94,7 @@ NS_MSG_HINTS = 'urn:xmpp:hints' # XEP-0280 NS_HTTP_AUTH = 'http://jabber.org/protocol/http-auth' # XEP-0070 NS_HTTP_BIND = 'http://jabber.org/protocol/httpbind' # XEP-0124 NS_HTTPUPLOAD = 'urn:xmpp:http:upload' # XEP-0363 -NS_HTTPUPLOAD_0 = 'urn:xmpp:http:upload:0' # XEP-0363 +NS_HTTPUPLOAD_0 = 'urn:xmpp:http:upload:0' # XEP-0363 NS_IBB = 'http://jabber.org/protocol/ibb' NS_IDLE = 'urn:xmpp:idle:1' # XEP-0319 NS_INVISIBLE = 'presence-invisible' # Jabberd2 @@ -208,83 +208,6 @@ NS_HINTS = 'urn:xmpp:hints' NS_MUCLUMBUS = 'https://xmlns.zombofant.net/muclumbus/search/1.0' NS_FRAMING = 'urn:ietf:params:xml:ns:xmpp-framing' -#xmpp_stream_error_conditions = ''' -#bad-format -- -- -- The entity has sent XML that cannot be processed. -#bad-namespace-prefix -- -- -- The entity has sent a namespace prefix that is unsupported, or has sent no namespace prefix on an element that requires such a prefix. -#conflict -- -- -- The server is closing the active stream for this entity because a new stream has been initiated that conflicts with the existing stream. -#connection-timeout -- -- -- The entity has not generated any traffic over the stream for some period of time. -#host-gone -- -- -- The value of the 'to' attribute provided by the initiating entity in the stream header corresponds to a hostname that is no longer hosted by the server. -#host-unknown -- -- -- The value of the 'to' attribute provided by the initiating entity in the stream header does not correspond to a hostname that is hosted by the server. -#improper-addressing -- -- -- A stanza sent between two servers lacks a 'to' or 'from' attribute (or the attribute has no value). -#internal-server-error -- -- -- The server has experienced a misconfiguration or an otherwise-undefined internal error that prevents it from servicing the stream. -#invalid-from -- cancel -- -- The JID or hostname provided in a 'from' address does not match an authorized JID or validated domain negotiated between servers via SASL or dialback, or between a client and a server via authentication and resource authorization. -#invalid-id -- -- -- The stream ID or dialback ID is invalid or does not match an ID previously provided. -#invalid-namespace -- -- -- The streams namespace name is something other than "http://etherx.jabber.org/streams" or the dialback namespace name is something other than "jabber:server:dialback". -#invalid-xml -- -- -- The entity has sent invalid XML over the stream to a server that performs validation. -#not-authorized -- -- -- The entity has attempted to send data before the stream has been authenticated, or otherwise is not authorized to perform an action related to stream negotiation. -#policy-violation -- -- -- The entity has violated some local service policy. -#remote-connection-failed -- -- -- The server is unable to properly connect to a remote resource that is required for authentication or authorization. -#resource-constraint -- -- -- The server lacks the system resources necessary to service the stream. -#restricted-xml -- -- -- The entity has attempted to send restricted XML features such as a comment, processing instruction, DTD, entity reference, or unescaped character. -#see-other-host -- -- -- The server will not provide service to the initiating entity but is redirecting traffic to another host. -#system-shutdown -- -- -- The server is being shut down and all active streams are being closed. -#undefined-condition -- -- -- The error condition is not one of those defined by the other conditions in this list. -#unsupported-encoding -- -- -- The initiating entity has encoded the stream in an encoding that is not supported by the server. -#unsupported-stanza-type -- -- -- The initiating entity has sent a first-level child of the stream that is not supported by the server. -#unsupported-version -- -- -- The value of the 'version' attribute provided by the initiating entity in the stream header specifies a version of XMPP that is not supported by the server. -#xml-not-well-formed -- -- -- The initiating entity has sent XML that is not well-formed.''' - -#xmpp_stanza_error_conditions = ''' -#bad-request -- 400 -- modify -- The sender has sent XML that is malformed or that cannot be processed. -#conflict -- 409 -- cancel -- Access cannot be granted because an existing resource or session exists with the same name or address. -#feature-not-implemented -- 501 -- cancel -- The feature requested is not implemented by the recipient or server and therefore cannot be processed. -#forbidden -- 403 -- auth -- The requesting entity does not possess the required permissions to perform the action. -#gone -- 302 -- modify -- The recipient or server can no longer be contacted at this address. -#internal-server-error -- 500 -- wait -- The server could not process the stanza because of a misconfiguration or an otherwise-undefined internal server error. -#item-not-found -- 404 -- cancel -- The addressed JID or item requested cannot be found. -#jid-malformed -- 400 -- modify -- The value of the 'to' attribute in the sender's stanza does not adhere to the syntax defined in Addressing Scheme. -#not-acceptable -- 406 -- cancel -- The recipient or server understands the request but is refusing to process it because it does not meet criteria defined by the recipient or server. -#not-allowed -- 405 -- cancel -- The recipient or server does not allow any entity to perform the action. -#not-authorized -- 401 -- auth -- The sender must provide proper credentials before being allowed to perform the action, or has provided improper credentials. -#payment-required -- 402 -- auth -- The requesting entity is not authorized to access the requested service because payment is required. -#recipient-unavailable -- 404 -- wait -- The intended recipient is temporarily unavailable. -#redirect -- 302 -- modify -- The recipient or server is redirecting requests for this information to another entity. -#registration-required -- 407 -- auth -- The requesting entity is not authorized to access the requested service because registration is required. -#remote-server-not-found -- 404 -- cancel -- A remote server or service specified as part or all of the JID of the intended recipient does not exist. -#remote-server-timeout -- 504 -- wait -- A remote server or service specified as part or all of the JID of the intended recipient could not be contacted within a reasonable amount of time. -#resource-constraint -- 500 -- wait -- The server or recipient lacks the system resources necessary to service the request. -#service-unavailable -- 503 -- cancel -- The server or recipient does not currently provide the requested service. -#subscription-required -- 407 -- auth -- The requesting entity is not authorized to access the requested service because a subscription is required. -#undefined-condition -- 500 -- -- Undefined Condition -#unexpected-request -- 400 -- wait -- The recipient or server understood the request but was not expecting it at this time (e.g., the request was out of order).''' - -#sasl_error_conditions = ''' -#aborted -- -- -- The receiving entity acknowledges an <abort/> element sent by the initiating entity; sent in reply to the <abort/> element. -#incorrect-encoding -- -- -- The data provided by the initiating entity could not be processed because the [BASE64]Josefsson, S., The Base16, Base32, and Base64 Data Encodings, July 2003. encoding is incorrect (e.g., because the encoding does not adhere to the definition in Section 3 of [BASE64]Josefsson, S., The Base16, Base32, and Base64 Data Encodings, July 2003.); sent in reply to a <response/> element or an <auth/> element with initial response data. -#invalid-authzid -- -- -- The authzid provided by the initiating entity is invalid, either because it is incorrectly formatted or because the initiating entity does not have permissions to authorize that ID; sent in reply to a <response/> element or an <auth/> element with initial response data. -#invalid-mechanism -- -- -- The initiating entity did not provide a mechanism or requested a mechanism that is not supported by the receiving entity; sent in reply to an <auth/> element. -#mechanism-too-weak -- -- -- The mechanism requested by the initiating entity is weaker than server policy permits for that initiating entity; sent in reply to a <response/> element or an <auth/> element with initial response data. -#not-authorized -- -- -- The authentication failed because the initiating entity did not provide valid credentials (this includes but is not limited to the case of an unknown username); sent in reply to a <response/> element or an <auth/> element with initial response data. -#temporary-auth-failure -- -- -- The authentication failed because of a temporary error condition within the receiving entity; sent in reply to an <auth/> element or <response/> element.''' - -#ERRORS, _errorcodes, loc = {}, {}, {} -#for ns, errname, errpool in ((NS_XMPP_STREAMS, 'STREAM', -#xmpp_stream_error_conditions), (NS_STANZAS, 'ERR', xmpp_stanza_error_conditions), -#(NS_SASL, 'SASL', sasl_error_conditions)): - #for err in errpool.split('\n')[1:]: - #cond, code, typ, text = err.split(' -- ') - #name = errname + '_' + ascii_upper(cond).replace('-', '_') - #locals()[name] = ns + ' ' + cond - #loc[name] = ns + ' ' + cond - #ERRORS[ns + ' ' + cond] = [code, typ, text] - #if code: - #_errorcodes[code] = cond -#del ns, errname, errpool, err, cond, code, typ, text -#import pprint -#pprint.pprint(ERRORS) -#pprint.pprint(_errorcodes) -#for (k, v) in loc.items(): - #print('%s = \'%s\'' % (k, v)) SASL_AUTH_MECHS = [ 'SCRAM-SHA-256-PLUS', @@ -687,7 +610,8 @@ class LocalpartNotAllowedChar(InvalidJid): class ResourcepartByteLimit(InvalidJid): def __init__(self): - InvalidJid.__init__(self, 'Resourcepart must be between 1 and 1023 bytes') + InvalidJid.__init__(self, + 'Resourcepart must be between 1 and 1023 bytes') class ResourcepartNotAllowedChar(InvalidJid): def __init__(self): @@ -881,8 +805,8 @@ class JID: def setResource(self, resource): """ - Set the resource part of the JID to new value. Specify None to remove the - resource part + Set the resource part of the JID to new value. + Specify None to remove the resource part """ self.resource = resource @@ -991,7 +915,8 @@ class StreamErrorNode(Node): def get_condition(self): for tag in self.getChildren(): - if tag.getName() != 'text' and tag.getNamespace() == NS_XMPP_STREAMS: + if (tag.getName() != 'text' and + tag.getNamespace() == NS_XMPP_STREAMS): return tag.getName() return None @@ -1019,8 +944,16 @@ class Protocol(Node): and messages """ - def __init__(self, name=None, to=None, typ=None, frm=None, attrs=None, - payload=None, timestamp=None, xmlns=None, node=None): + def __init__(self, + name=None, + to=None, + typ=None, + frm=None, + attrs=None, + payload=None, + timestamp=None, + xmlns=None, + node=None): """ Constructor, name is the name of the stanza i.e. 'message' or 'presence'or 'iq' @@ -1067,7 +1000,7 @@ class Protocol(Node): except Exception: pass if timestamp is not None: - self.setTimestamp(timestamp) # To auto-timestamp stanza just pass timestamp='' + self.setTimestamp(timestamp) def getTo(self): """ @@ -1248,7 +1181,8 @@ class Protocol(Node): def getProperties(self): """ - Return the list of namespaces to which belongs the direct childs of element + Return the list of namespaces to which belongs the + direct childs of element """ props = [] for child in self.getChildren(): @@ -1283,9 +1217,18 @@ class Message(Protocol): XMPP Message stanza - "push" mechanism """ - def __init__(self, to=None, body=None, xhtml=None, typ=None, subject=None, - attrs=None, frm=None, payload=None, timestamp=None, xmlns=NS_CLIENT, - node=None): + def __init__(self, + to=None, + body=None, + xhtml=None, + typ=None, + subject=None, + attrs=None, + frm=None, + payload=None, + timestamp=None, + xmlns=NS_CLIENT, + node=None): """ You can specify recipient, text of message, type of message any additional attributes, sender of the message, any additional payload @@ -1294,8 +1237,16 @@ class Message(Protocol): Alternatively you can pass in the other XML object as the 'node' parameted to replicate it as message """ - Protocol.__init__(self, 'message', to=to, typ=typ, attrs=attrs, frm=frm, - payload=payload, timestamp=timestamp, xmlns=xmlns, node=node) + Protocol.__init__(self, + 'message', + to=to, + typ=typ, + attrs=attrs, + frm=frm, + payload=payload, + timestamp=timestamp, + xmlns=xmlns, + node=node) if body: self.setBody(body) if xhtml is not None: @@ -1384,8 +1335,10 @@ class Message(Protocol): from, thread and type properties of new message are pre-set as reply to this message """ - m = Message(to=self.getFrom(), frm=self.getTo(), body=text, - typ=self.getType()) + m = Message(to=self.getFrom(), + frm=self.getTo(), + body=text, + typ=self.getType()) th = self.getThread() if th: m.setThread(th) @@ -1431,18 +1384,35 @@ class Message(Protocol): class Presence(Protocol): - def __init__(self, to=None, typ=None, priority=None, show=None, status=None, - attrs=None, frm=None, timestamp=None, payload=None, xmlns=NS_CLIENT, - node=None): + def __init__(self, + to=None, + typ=None, + priority=None, + show=None, + status=None, + attrs=None, + frm=None, + timestamp=None, + payload=None, + xmlns=NS_CLIENT, + node=None): """ You can specify recipient, type of message, priority, show and status values any additional attributes, sender of the presence, timestamp, any - additional payload (f.e. jabber:x:delay element) and namespace in one go. - Alternatively you can pass in the other XML object as the 'node' + additional payload (f.e. jabber:x:delay element) and namespace in one + go. Alternatively you can pass in the other XML object as the 'node' parameted to replicate it as presence """ - Protocol.__init__(self, 'presence', to=to, typ=typ, attrs=attrs, frm=frm, - payload=payload, timestamp=timestamp, xmlns=xmlns, node=node) + Protocol.__init__(self, + 'presence', + to=to, + typ=typ, + attrs=attrs, + frm=frm, + payload=payload, + timestamp=timestamp, + xmlns=xmlns, + node=node) if priority: self.setPriority(priority) if show: @@ -1555,8 +1525,15 @@ class Iq(Protocol): XMPP Iq object - get/set dialog mechanism """ - def __init__(self, typ=None, queryNS=None, attrs=None, to=None, frm=None, - payload=None, xmlns=NS_CLIENT, node=None): + def __init__(self, + typ=None, + queryNS=None, + attrs=None, + to=None, + frm=None, + payload=None, + xmlns=NS_CLIENT, + node=None): """ You can specify type, query namespace any additional attributes, recipient of the iq, sender of the iq, any additional payload (f.e. @@ -1565,8 +1542,14 @@ class Iq(Protocol): Alternatively you can pass in the other XML object as the 'node' parameted to replicate it as an iq """ - Protocol.__init__(self, 'iq', to=to, typ=typ, attrs=attrs, frm=frm, - xmlns=xmlns, node=node) + Protocol.__init__(self, + 'iq', + to=to, + typ=typ, + attrs=attrs, + frm=frm, + xmlns=xmlns, + node=node) if payload: self.setQueryPayload(payload) if queryNS: @@ -1671,8 +1654,10 @@ class Iq(Protocol): Build and return another Iq object of specified type. The to, from and query child node of new Iq are pre-set as reply to this Iq. """ - iq = Iq(typ, to=self.getFrom(), frm=self.getTo(), - attrs={'id': self.getID()}) + iq = Iq(typ, + to=self.getFrom(), + frm=self.getTo(), + attrs={'id': self.getID()}) iq.setQuery(self.getQuery().getName()).setNamespace(self.getQueryNS()) return iq @@ -1754,7 +1739,8 @@ class Hashes2(Node): BLAKE2b512 SHOULD """ - supported = ('sha-256', 'sha-512', 'sha3-256', 'sha3-512', 'blake2b-256', 'blake2b-512') + supported = ('sha-256', 'sha-512', 'sha3-256', + 'sha3-512', 'blake2b-256', 'blake2b-512') def __init__(self, nsp=NS_HASHES_2): Node.__init__(self, None, {}, [], None, None, False, None) @@ -1943,7 +1929,10 @@ class Error(Protocol): 'from' fields needs not swapping) specify the 'reply' argument as false. """ if reply: - Protocol.__init__(self, to=node.getFrom(), frm=node.getTo(), node=node) + Protocol.__init__(self, + to=node.getFrom(), + frm=node.getTo(), + node=node) else: Protocol.__init__(self, node=node) self.setError(error) @@ -1952,8 +1941,9 @@ class Error(Protocol): def __dupstr__(self, _dup1=None, _dup2=None): """ - Dummy function used as preventor of creating error node in reply to error - node. I.e. you will not be able to serialise "double" error into string. + Dummy function used as preventor of creating error node in reply to + error node. I.e. you will not be able to serialise "double" error + into string. """ return '' @@ -1965,8 +1955,14 @@ class DataField(Node): you will need to work with instances of this class. """ - def __init__(self, name=None, value=None, typ=None, required=0, desc=None, - options=None, node=None): + def __init__(self, + name=None, + value=None, + typ=None, + required=0, + desc=None, + options=None, + node=None): """ Create new data field of specified name,value and type @@ -2079,8 +2075,8 @@ class DataField(Node): Add one more label-option pair to this field """ if isinstance(opt, list): - self.addChild('option', {'label': opt[0]}).setTagData('value', - opt[1]) + self.addChild('option', + {'label': opt[0]}).setTagData('value', opt[1]) else: self.addChild('option').setTagData('value', opt) @@ -2125,8 +2121,10 @@ class DataForm(Node): title and instructions is optional and SHOULD NOT contain newlines. Several instructions MAY be present. 'typ' can be one of ('form' | 'submit' | 'cancel' | 'result' ) - 'typ' of reply iq can be ( 'result' | 'set' | 'set' | 'result' ) respectively. - 'cancel' form can not contain any fields. All other forms contains AT LEAST one field. + 'typ' of reply iq can be ( 'result' | 'set' | 'set' | 'result' ) + respectively. + 'cancel' form can not contain any fields. All other forms contains + AT LEAST one field. 'title' MAY be included in forms of type "form" and "result" """ Node.__init__(self, 'x', node=node) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/c82a4634f45a34d3dcd65a8… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/c82a4634f45a34d3dcd65a8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Fix pylint errors
by Philipp Hörist 19 Apr '20

19 Apr '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: c82a4634 by lovetox at 2020-04-19T09:14:33+02:00 Fix pylint errors - line-too-long - - - - - 11 changed files: - nbxmpp/client.py - nbxmpp/dispatcher.py - nbxmpp/idlequeue.py - nbxmpp/modules/dataforms.py - nbxmpp/modules/http_upload.py - nbxmpp/modules/ibb.py - nbxmpp/modules/muclumbus.py - nbxmpp/modules/omemo.py - nbxmpp/plugin.py - nbxmpp/smacks.py - nbxmpp/third_party/hsluv.py Changes: ===================================== nbxmpp/client.py ===================================== @@ -430,7 +430,8 @@ class Client(Observable): else: self._set_error(StreamError.CONNECTION_FAILED, 'connection-failed', - 'Unable to connect to last successful address: %s' % str(self._current_address)) + (f'Unable to connect to last ' + 'successful address: {self._current_address}')) self.notify('connection-failed') def _disconnect_with_error(self, error_domain, error, text=None): @@ -475,11 +476,13 @@ class Client(Observable): return self._dispatcher.get_module(name) def _on_bad_certificate(self, connection, _signal_name): - self._peer_certificate, self._peer_certificate_errors = connection.peer_certificate + self._peer_certificate, self._peer_certificate_errors = \ + connection.peer_certificate self._set_error(StreamError.BAD_CERTIFICATE, 'bad certificate') def _on_certificate_set(self, connection, _signal_name): - self._peer_certificate, self._peer_certificate_errors = connection.peer_certificate + self._peer_certificate, self._peer_certificate_errors = \ + connection.peer_certificate def accept_certificate(self): self._log.info('Certificate accepted') ===================================== nbxmpp/dispatcher.py ===================================== @@ -274,8 +274,9 @@ class StanzaDispatcher(Observable): if not typ and not ns: typ = 'default' - self._log.debug('Register handler %s for "%s" type->%s ns->%s(%s) priority->%s', - handler, name, typ, ns, xmlns, priority) + self._log.debug( + 'Register handler %s for "%s" type->%s ns->%s(%s) priority->%s', + handler, name, typ, ns, xmlns, priority) if xmlns not in self._handlers: self._register_namespace(xmlns) @@ -315,11 +316,13 @@ class StanzaDispatcher(Observable): try: self._handlers[xmlns][name][specific].remove(handler_dict) except ValueError: - self._log.warning('Unregister failed: %s for "%s" type->%s ns->%s(%s)', - handler, name, typ, ns, xmlns) + self._log.warning( + 'Unregister failed: %s for "%s" type->%s ns->%s(%s)', + handler, name, typ, ns, xmlns) else: - self._log.debug('Unregister handler %s for "%s" type->%s ns->%s(%s)', - handler, name, typ, ns, xmlns) + self._log.debug( + 'Unregister handler %s for "%s" type->%s ns->%s(%s)', + handler, name, typ, ns, xmlns) def _default_handler(self, stanza): """ ===================================== nbxmpp/idlequeue.py ===================================== @@ -46,7 +46,7 @@ if HAVE_GLIB: GLib.IOCondition.PRI | GLib.IOCondition.HUP FLAG_CLOSE = GLib.IOCondition.HUP PENDING_READ = GLib.IOCondition.IN # There is data to read. - PENDING_WRITE = GLib.IOCondition.OUT # Data CAN be written without blocking. + PENDING_WRITE = GLib.IOCondition.OUT # Data CAN be written without blocking IS_CLOSED = GLib.IOCondition.HUP # Hung up (connection broken) else: FLAG_WRITE = 20 # write only 10100 @@ -222,7 +222,8 @@ class IdleQueue: """ # (timeout, boolean) - # Boolean is True if timeout is specified in seconds, False means miliseconds + # Boolean is True if timeout is specified in seconds, + # False means miliseconds PROCESS_TIMEOUT = (100, False) def __init__(self): @@ -438,8 +439,9 @@ class SelectIdleQueue(IdleQueue): def checkQueue(self): """ - Iterates through all known file descriptors and uses os.stat to check if they're valid. - Greatly improves performance if the caller hands us and expects notification on an invalid file handle. + Iterates through all known file descriptors and uses os.stat to + check if they're valid. Greatly improves performance if the caller + hands us and expects notification on an invalid file handle. """ bad_fds=[] union={} @@ -480,8 +482,8 @@ class SelectIdleQueue(IdleQueue): def _remove_idle(self, fd): """ - This method is called when we unplug a new idle object. Remove descriptor - from read/write/error lists + This method is called when we unplug a new idle object. + Remove descriptor from read/write/error lists """ if fd in self.read_fds: del(self.read_fds[fd]) @@ -525,7 +527,8 @@ class GlibIdleQueue(IdleQueue): """ # (timeout, boolean) - # Boolean is True if timeout is specified in seconds, False means miliseconds + # Boolean is True if timeout is specified in seconds, + # False means miliseconds PROCESS_TIMEOUT = (2, True) def _init_idle(self): @@ -536,8 +539,8 @@ class GlibIdleQueue(IdleQueue): def _add_idle(self, fd, flags): """ - This method is called when we plug a new idle object. Start listening for - events from fd + This method is called when we plug a new idle object. + Start listening for events from fd """ res = GLib.io_add_watch(fd, GLib.PRIORITY_LOW, flags, self._process_events) ===================================== nbxmpp/modules/dataforms.py ===================================== @@ -108,8 +108,8 @@ def extend_form(node): class DataField(ExtendedNode): """ Keeps data about one field - var, field type, labels, instructions... Base - class for different kinds of fields. Use create_field() function to construct one - of these + class for different kinds of fields. Use create_field() function to + construct one of these """ def __init__(self, typ=None, var=None, value=None, label=None, desc=None, ===================================== nbxmpp/modules/http_upload.py ===================================== @@ -70,11 +70,13 @@ class HTTPUpload(BaseModule): for header in slot.getTag('put').getTags('header'): name = header.getAttr('name') if name not in ALLOWED_HEADERS: - return raise_error(self._log.warning, stanza, 'stanza-malformed', + return raise_error(self._log.warning, stanza, + 'stanza-malformed', 'Not allowed header found: %s' % name) data = header.getData() if '\n' in data: - return raise_error(self._log.warning, stanza, 'stanza-malformed', + return raise_error(self._log.warning, stanza, + 'stanza-malformed', 'NNewline in header data found') headers[name] = data ===================================== nbxmpp/modules/ibb.py ===================================== @@ -149,7 +149,9 @@ class IBB(BaseModule): @call_on_response('_default_response') def send_data(self, jid, sid, seq, data): iq = Iq('set', to=jid) - ibb_data = iq.addChild('data', {'sid': sid, 'seq': seq}, namespace=NS_IBB) + ibb_data = iq.addChild('data', + {'sid': sid, 'seq': seq}, + namespace=NS_IBB) ibb_data.setData(b64encode(data)) return iq ===================================== nbxmpp/modules/muclumbus.py ===================================== @@ -142,7 +142,8 @@ class Muclumbus(BaseModule): is_open = item.getTag('is-open') is not None try: - anonymity_mode = AnonymityMode(item.getTagData('anonymity-mode')) + anonymity_mode = AnonymityMode( + item.getTagData('anonymity-mode')) except ValueError: anonymity_mode = AnonymityMode.UNKNOWN results.append(MuclumbusItem(jid=jid, ===================================== nbxmpp/modules/omemo.py ===================================== @@ -336,7 +336,8 @@ class OMEMO(BaseModule): result = {} signed_prekey_node = bundle.getTag('signedPreKeyPublic') try: - result['spk'] = {'key': b64decode(signed_prekey_node.getData(), bytes)} + result['spk'] = {'key': b64decode(signed_prekey_node.getData(), + bytes)} except Exception as error: raise StanzaMalformed('Failed to decode ' 'signedPreKeyPublic: %s' % error) @@ -349,7 +350,8 @@ class OMEMO(BaseModule): signed_signature_node = bundle.getTag('signedPreKeySignature') try: - result['spk_signature'] = b64decode(signed_signature_node.getData(), bytes) + result['spk_signature'] = b64decode(signed_signature_node.getData(), + bytes) except Exception as error: raise StanzaMalformed('Failed to decode ' 'signedPreKeySignature: %s' % error) @@ -375,7 +377,8 @@ class OMEMO(BaseModule): try: key = b64decode(prekey.getData(), bytes) except Exception as error: - raise StanzaMalformed('Failed to decode preKeyPublic: %s' % error) + raise StanzaMalformed( + 'Failed to decode preKeyPublic: %s' % error) result['otpks'].append({'key': key, 'id': id_}) ===================================== nbxmpp/plugin.py ===================================== @@ -66,8 +66,8 @@ class PlugIn: def PlugOut(self, *args, **kwargs): """ Unregister our _exported_methods from owner and detach from it. - If defined by a subclass, call self.plugout() after unplugging to execute - hook code + If defined by a subclass, call self.plugout() after unplugging to + execute hook code """ log.info('Plugging %s __OUT__ of %s.', self, self._owner) for method in self._exported_methods: ===================================== nbxmpp/smacks.py ===================================== @@ -109,8 +109,9 @@ class Smacks: self._location = stanza.getAttr('location') self.enabled = True - self._log.info('Received enabled, location: %s, resume supported: %s, ' - 'session-id: %s', self._location, resume, self._session_id) + self._log.info( + 'Received enabled, location: %s, resume supported: %s, ' + 'session-id: %s', self._location, resume, self._session_id) def count_incoming(self, name): if not self.enabled: @@ -248,15 +249,17 @@ class Smacks: diff = self._out_h - count_server queue_size = len(queue) if diff < 0: - self._log.error('Mismatch detected, our h: %d, server h: %d, queue: %d', - self._out_h, count_server, queue_size) + self._log.error( + 'Mismatch detected, our h: %d, server h: %d, queue: %d', + self._out_h, count_server, queue_size) # Don't accumulate all messages in this case # (they would otherwise all be resent on the next reconnect) queue = [] elif queue_size < diff: - self._log.error('Mismatch detected, our h: %d, server h: %d, queue: %d', - self._out_h, count_server, queue_size) + self._log.error( + 'Mismatch detected, our h: %d, server h: %d, queue: %d', + self._out_h, count_server, queue_size) else: self._log.debug('Validate ack, our h: %d, server h: %d, queue: %d', self._out_h, count_server, queue_size) ===================================== nbxmpp/third_party/hsluv.py ===================================== @@ -42,7 +42,8 @@ def _distance_line_from_origin(line): def _length_of_ray_until_intersect(theta, line): - return line['intercept'] / (math.sin(theta) - line['slope'] * math.cos(theta)) + return line['intercept'] / (math.sin(theta) - + line['slope'] * math.cos(theta)) def _get_bounds(l): @@ -64,7 +65,8 @@ def _get_bounds(l): t = _g1 _g1 = _g1 + 1 top1 = (284517 * m1 - 94839 * m3) * sub2 - top2 = (838422 * m3 + 769860 * m2 + 731718 * m1) * l * sub2 - (769860 * t) * l + top2 = ((838422 * m3 + 769860 * m2 + 731718 * m1) * + l * sub2 - (769860 * t) * l) bottom = (632260 * m3 - 126452 * m2) * sub2 + 126452 * t result.append({'slope': top1 / bottom, 'intercept': top2 / bottom}) return result View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/c82a4634f45a34d3dcd65a88… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/c82a4634f45a34d3dcd65a88… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 4 commits: Add mypy.ini
by Philipp Hörist 19 Apr '20

19 Apr '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: a5dccb15 by lovetox at 2020-04-19T08:41:31+02:00 Add mypy.ini - - - - - 0ef1ba6b by lovetox at 2020-04-19T08:42:12+02:00 Update .gitignore - - - - - 3441e467 by lovetox at 2020-04-19T08:51:21+02:00 Fix pylint errors - - - - - 2609572a by lovetox at 2020-04-19T08:54:32+02:00 Fix pylint errors - logging-not-lazy - - - - - 8 changed files: - .gitignore - .gitlab-ci.yml - + mypy.ini - nbxmpp/const.py - nbxmpp/idlequeue.py - nbxmpp/old_dispatcher.py - nbxmpp/plugin.py - nbxmpp/simplexml.py Changes: ===================================== .gitignore ===================================== @@ -1,5 +1,6 @@ build/ __pycache__/ +.mypy_cache/ nbxmpp.egg-info dist .idea ===================================== .gitlab-ci.yml ===================================== @@ -13,7 +13,7 @@ run-test: - virtualenv -p python3 --system-site-packages civenv-nbxmpp - . ./civenv-nbxmpp/bin/activate - pip3 install -I pylint==2.4.4 - - python3 -m pylint nbxmpp --disable=C0103,C0201,C0301,C0325,C0326,C0330,W0201,W0212,W0221,W0231,W0233,W0401,W0601,W0614,W0621,W0622,W1201,R0201,E1101,E1135 + - python3 -m pylint nbxmpp --disable=C0103,C0201,C0301,C0325,C0326,C0330,W0201,W0212,W0221,W0231,W0233,W0401,W0601,W0614,W0621,W0622,R0201,E1101,E1135 - deactivate - rm -rf civenv-nbxmpp ===================================== mypy.ini ===================================== @@ -0,0 +1,14 @@ +[mypy] +python_version = 3.7 +warn_unused_configs = True +disallow_incomplete_defs = True +allow_redefinition = True + +[mypy-gi.*] +ignore_missing_imports = True + +[mypy-precis_i18n.*] +ignore_missing_imports = True + +[mypy-idna.*] +ignore_missing_imports = True ===================================== nbxmpp/const.py ===================================== @@ -652,3 +652,12 @@ GIO_TLS_ERRORS = { Gio.TlsCertificateFlags.EXPIRED: 'The certificate has expired', } # pylint: enable=line-too-long + +NOT_ALLOWED_XML_CHARS = { + '&': '&', + '<': '<', + '>': '>', + '"': '"', + '\x0C': '', + '\x1B': '' +} ===================================== nbxmpp/idlequeue.py ===================================== @@ -281,7 +281,7 @@ class IdleQueue: """ Remove the read timeout """ - log.debug('read timeout removed for fd %s' % fd) + log.debug('read timeout removed for fd %s', fd) if fd in self.read_timeouts: if timeout: if timeout in self.read_timeouts[fd]: @@ -323,10 +323,10 @@ class IdleQueue: if timeout > current_time: continue if func: - log.debug('Calling %s for fd %s' % (func, fd)) + log.debug('Calling %s for fd %s', func, fd) func() else: - log.debug('Calling read_timeout for fd %s' % fd) + log.debug('Calling read_timeout for fd %s', fd) self.queue[fd].read_timeout() self.remove_timeout(fd, timeout) ===================================== nbxmpp/old_dispatcher.py ===================================== @@ -332,7 +332,7 @@ class XMPPDispatcher(PlugIn): self._owner.Connection.disconnect() return 0 except ValueError as e: - log.debug('ValueError: %s' % str(e)) + log.debug('ValueError: %s', e) self._owner.Connection.pollend() return 0 if len(self._pendingExceptions) > 0: @@ -351,7 +351,7 @@ class XMPPDispatcher(PlugIn): one namespace is already registered (jabber:client or jabber:component:accept depending on context. """ - log.debug('Registering namespace "%s"' % xmlns) + log.debug('Registering namespace "%s"', xmlns) self.handlers[xmlns] = {} self.RegisterProtocol('unknown', Protocol, xmlns=xmlns) self.RegisterProtocol('default', Protocol, xmlns=xmlns) @@ -506,7 +506,7 @@ class XMPPDispatcher(PlugIn): if self._eventHandler: self._eventHandler(realm, event, data) else: - log.warning('Received unhandled event: %s' % event) + log.warning('Received unhandled event: %s', event) def dispatch(self, stanza): """ ===================================== nbxmpp/plugin.py ===================================== @@ -42,7 +42,7 @@ class PlugIn: code after plugging """ self._owner=owner - log.info('Plugging %s __INTO__ %s' % (self, self._owner)) + log.info('Plugging %s __INTO__ %s', self, self._owner) if self.__class__.__name__ in owner.__dict__: log.debug('Plugging ignored: another instance already plugged.') return None @@ -69,7 +69,7 @@ class PlugIn: If defined by a subclass, call self.plugout() after unplugging to execute hook code """ - log.info('Plugging %s __OUT__ of %s.' % (self, self._owner)) + log.info('Plugging %s __OUT__ of %s.', self, self._owner) for method in self._exported_methods: del self._owner.__dict__[method.__name__] for method in self._old_owners_methods: ===================================== nbxmpp/simplexml.py ===================================== @@ -20,23 +20,34 @@ projects. It is designed to be as standalone as possible from __future__ import annotations +from typing import Dict +from typing import List +from typing import Optional +from typing import Union +from typing import Iterator +from typing import Callable +from typing import Any + import logging import xml.parsers.expat from xml.parsers.expat import ExpatError from copy import deepcopy -from typing import Dict, List, Optional, Union, Iterator, Callable, Any + +from nbxmpp.const import NOT_ALLOWED_XML_CHARS + Attrs = Dict[str, str] log = logging.getLogger('nbxmpp.simplexml') -def XMLescape(txt: str) -> str: +def XMLescape(text: str) -> str: """ - Return provided string with symbols & < > " replaced by their respective XML - entities + Return escaped text """ - # replace also FORM FEED and ESC, because they are not valid XML chars - return txt.replace("&", "&").replace("<", "<").replace(">", ">").replace('"', """).replace('\x0C', "").replace('\x1B', "") + + for key, value in NOT_ALLOWED_XML_CHARS.items(): + text = text.replace(key, value) + return text class Node: """ @@ -70,15 +81,22 @@ class Node: FORCE_NODE_RECREATION = False - def __init__(self, tag: Optional[str] = None, attrs: Optional[Attrs] = None, payload: Optional[Union[Node, str, List[Union[Node, str]]]] = None, parent: Optional[Node] = None, nsp: Optional[Dict[Any, Any]] = None, - node_built: bool = False, node: Optional[Union[Node, Any]] = None) -> None: + def __init__( + self, + tag: Optional[str] = None, + attrs: Optional[Attrs] = None, + payload: Optional[Union[Node, str, List[Union[Node, str]]]] = None, + parent: Optional[Node] = None, + nsp: Optional[Dict[Any, Any]] = None, + node_built: bool = False, + node: Optional[Union[Node, Any]] = None) -> None: """ Takes "tag" argument as the name of node (prepended by namespace, if needed and separated from it by a space), attrs dictionary as the set of arguments, payload list as the set of textual strings and child nodes that this node carries within itself and "parent" argument that is - another node that this one will be the child of. Also the __init__ can be - provided with "node" argument that is either a text string containing + another node that this one will be the child of. Also the __init__ can + be provided with "node" argument that is either a text string containing exactly one node or another Node instance to begin with. If both "node" and other arguments is provided then the node initially created as replica of "node" provided and then modified to be compliant with other @@ -91,23 +109,35 @@ class Node: node = NodeBuilder(node, self) node_built = True else: - self.name, self.namespace, self.attrs, self.data, self.kids, self.parent, self.nsd = node.name, node.namespace, {}, [], [], node.parent, {} + self.name = node.name + self.namespace = node.namespace + self.attrs = {} + self.data = [] + self.kids = [] + self.parent = node.parent + self.nsd = {} for key in node.attrs.keys(): self.attrs[key] = node.attrs[key] for data in node.data: self.data.append(data) for kid in node.kids: self.kids.append(kid) - for k, v in node.nsd.items(): - self.nsd[k] = v + for key, value in node.nsd.items(): + self.nsd[key] = value else: - self.name, self.namespace, self.attrs, self.data, self.kids, self.parent, self.nsd = 'tag', '', {}, [], [], None, {} + self.name = 'tag' + self.namespace = '' + self.attrs = {} + self.data = [] + self.kids = [] + self.parent = None + self.nsd = {} if parent: self.parent = parent self.nsp_cache = {} if nsp: - for k, v in nsp.items(): - self.nsp_cache[k] = v + for key, value in nsp.items(): + self.nsp_cache[key] = value if attrs is not None: for attr, val in attrs.items(): @@ -149,8 +179,8 @@ class Node: def __str__(self, fancy: int = 0) -> str: """ - Method used to dump node into textual representation. If "fancy" argument - is set to True produces indented output for readability + Method used to dump node into textual representation. If "fancy" + argument is set to True produces indented output for readability """ s = (fancy-1) * 2 * ' ' + "<" + self.name if self.namespace: @@ -192,7 +222,12 @@ class Node: s += "\n" return s - def addChild(self, name: Optional[str] = None, attrs: Optional[Attrs] = None, payload: Optional[List[Any]] = None, namespace: Optional[str] = None, node: Optional[Node] = None) -> Node: + def addChild(self, + name: Optional[str] = None, + attrs: Optional[Attrs] = None, + payload: Optional[List[Any]] = None, + namespace: Optional[str] = None, + node: Optional[Node] = None) -> Node: """ If "node" argument is provided, adds it as child node. Else creates new node from the other arguments' values and adds it as well @@ -231,7 +266,9 @@ class Node: """ del self.attrs[key] - def delChild(self, node: Union[Node, str], attrs: Optional[Attrs] = None) -> Optional[Node]: + def delChild(self, + node: Union[Node, str], + attrs: Optional[Attrs] = None) -> Optional[Node]: """ Delete the "node" from the node's childs list, if "node" is an instance. Else delete the first node that have specified name and (optionally) @@ -306,7 +343,10 @@ class Node: pass return ret - def getTag(self, name: str, attrs: Optional[Attrs] = None, namespace: Optional[str] = None) -> Optional[Node]: + def getTag(self, + name: str, + attrs: Optional[Attrs] = None, + namespace: Optional[str] = None) -> Optional[Node]: """ Filter all child nodes using specified arguments as filter. Return the first found or None if not found @@ -315,7 +355,10 @@ class Node: assert not isinstance(tag, list) return tag - def getTagAttr(self, tag: str, attr: str, namespace: Optional[str] = None) -> Optional[str]: + def getTagAttr(self, + tag: str, + attr: str, + namespace: Optional[str] = None) -> Optional[str]: """ Return attribute value of the child with specified name (or None if no such attribute) @@ -334,7 +377,11 @@ class Node: return None return node.getData() - def getTags(self, name: str, attrs: Optional[Attrs] = None, namespace: Optional[str] = None, one: bool = False) -> Union[List[Node], Node, None]: + def getTags(self, + name: str, + attrs: Optional[Attrs] = None, + namespace: Optional[str] = None, + one: bool = False) -> Union[List[Node], Node, None]: """ Filter all child nodes using specified arguments as filter. Returns the list of nodes found @@ -347,7 +394,7 @@ class Node: if attrs is None: attrs = {} for key in attrs.keys(): - if key not in node.attrs or node.attrs[key]!=attrs[key]: + if key not in node.attrs or node.attrs[key] != attrs[key]: break else: nodes.append(node) @@ -357,7 +404,10 @@ class Node: return nodes return None - def iterTags(self, name: str, attrs: Optional[Attrs] = None, namespace: Optional[str] = None) -> Iterator[Node]: + def iterTags(self, + name: str, + attrs: Optional[Attrs] = None, + namespace: Optional[str] = None) -> Iterator[Node]: """ Iterate over all children using specified arguments as filter """ @@ -400,13 +450,15 @@ class Node: def setParent(self, node: Node) -> None: """ - Set node's parent to "node". WARNING: do not checks if the parent already - present and not removes the node from the list of childs of previous - parent + Set node's parent to "node". WARNING: do not checks if the parent + already present and not removes the node from the list of childs of + previous parent """ self.parent = node - def setPayload(self, payload: Union[List[Union[Node, str]], Node, str], add: bool = False) -> None: + def setPayload(self, + payload: Union[List[Union[Node, str]], Node, str], + add: bool = False) -> None: """ Set node payload according to the list specified. WARNING: completely replaces all node's previous content. If you wish just to add child or @@ -419,7 +471,10 @@ class Node: else: self.kids = payload - def setTag(self, name: str, attrs: Optional[Attrs] = None, namespace: Optional[str] = None) -> Node: + def setTag(self, + name: str, + attrs: Optional[Attrs] = None, + namespace: Optional[str] = None) -> Node: """ Same as getTag but if the node with specified namespace/attributes not found, creates such node and returns it @@ -429,7 +484,11 @@ class Node: return node return self.addChild(name, attrs, namespace=namespace) - def setTagAttr(self, tag: str, attr: str, val: str, namespace: Optional[str] = None) -> None: + def setTagAttr(self, + tag: str, + attr: str, + val: str, + namespace: Optional[str] = None) -> None: """ Create new node (if not already present) with name "tag" and set it's attribute "attr" to value "val" @@ -439,7 +498,10 @@ class Node: except Exception: self.addChild(tag, namespace=namespace, attrs={attr: val}) - def setTagData(self, tag: str, val: str, attrs: Optional[Attrs] = None) -> None: + def setTagData(self, + tag: str, + val: str, + attrs: Optional[Attrs] = None) -> None: """ Creates new node (if not already present) with name "tag" and (optionally) attributes "attrs" and sets it's CDATA to string "val" @@ -565,8 +627,11 @@ class NodeBuilder: streamError: str _is_stream: bool - def __init__(self, data: Optional[str] = None, initial_node: Optional[Node] = None, - dispatch_depth: int = 1, finished: bool = True) -> None: + def __init__(self, + data: Optional[str] = None, + initial_node: Optional[Node] = None, + dispatch_depth: int = 1, + finished: bool = True) -> None: """ Take two optional parameters: "data" and "initial_node" @@ -586,7 +651,8 @@ class NodeBuilder: self._parser.CommentHandler = self.handle_invalid_xmpp_element self._parser.ExternalEntityRefHandler = self.handle_invalid_xmpp_element self._parser.AttlistDeclHandler = self.handle_invalid_xmpp_element - self._parser.ProcessingInstructionHandler = self.handle_invalid_xmpp_element + self._parser.ProcessingInstructionHandler = \ + self.handle_invalid_xmpp_element self._parser.buffer_text = True self.Parse = self._parser.Parse @@ -627,15 +693,26 @@ class NodeBuilder: """ self.check_data_buffer() self._inc_depth() - log.debug("STARTTAG.. DEPTH -> %i , tag -> %s, attrs -> %s" % (self.__depth, tag, attrs)) + log.debug("STARTTAG.. DEPTH -> %i , tag -> %s, attrs -> %s", + self.__depth, tag, attrs) if self.__depth == self._dispatch_depth: - if not self._mini_dom : - self._mini_dom = Node(tag=tag, attrs=attrs, nsp = self._document_nsp, node_built=True) + if not self._mini_dom: + self._mini_dom = Node(tag=tag, + attrs=attrs, + nsp=self._document_nsp, + node_built=True) else: - Node.__init__(self._mini_dom, tag=tag, attrs=attrs, nsp = self._document_nsp, node_built=True) + Node.__init__(self._mini_dom, + tag=tag, + attrs=attrs, + nsp=self._document_nsp, + node_built=True) self._ptr = self._mini_dom elif self.__depth > self._dispatch_depth: - self._ptr.kids.append(Node(tag=tag, parent=self._ptr, attrs=attrs, node_built=True)) + self._ptr.kids.append(Node(tag=tag, + parent=self._ptr, + attrs=attrs, + node_built=True)) self._ptr = self._ptr.kids[-1] if self.__depth == 1: self._document_attrs = {} @@ -648,15 +725,17 @@ class NodeBuilder: self._document_nsp[attr[6:]] = val else: self._document_attrs[attr] = val - ns = self._document_nsp.get(nsp, 'http://www.gajim.org/xmlns/undeclared-root') + ns = self._document_nsp.get( + nsp, 'http://www.gajim.org/xmlns/undeclared-root') try: - header = Node(tag=tag, attrs=attrs, + header = Node(tag=tag, + attrs=attrs, nsp=self._document_nsp, node_built=True) self.dispatch(header) self._check_stream_start(ns, name) - except ValueError as e: + except ValueError as error: self._document_attrs = None - raise ValueError(str(e)) + raise ValueError(str(error)) if not self.last_is_data and self._ptr.parent: self._ptr.parent.data.append('') self.last_is_data = False @@ -673,7 +752,7 @@ class NodeBuilder: """ XML Parser callback. Used internally """ - log.debug("DEPTH -> %i , tag -> %s" % (self.__depth, tag)) + log.debug("DEPTH -> %i , tag -> %s", self.__depth, tag) self.check_data_buffer() if self.__depth == self._dispatch_depth: if self._mini_dom.getName() == 'error': @@ -751,19 +830,19 @@ class NodeBuilder: self.__last_depth = self.__depth self.__depth -= 1 -def XML2Node(xml: str) -> Optional[Node]: +def XML2Node(xml_str: str) -> Optional[Node]: """ Convert supplied textual string into XML node. Handy f.e. for reading configuration file. Raises xml.parser.expat.parsererror if provided string is not well-formed XML """ - return NodeBuilder(xml).getDom() + return NodeBuilder(xml_str).getDom() -def BadXML2Node(xml: str) -> Optional[Node]: +def BadXML2Node(xml_str: str) -> Optional[Node]: """ Convert supplied textual string into XML node. Survives if xml data is cutted half way round. I.e. "<html>some text some more text". Will raise xml.parser.expat.parsererror on misplaced tags though. F.e. "some text some more text" will not work """ - return NodeBuilder(xml).getDom() + return NodeBuilder(xml_str).getDom() View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/f48e6f59858cfa7a836a12f… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/f48e6f59858cfa7a836a12f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Add typing hints to simplexml
by Philipp Hörist 19 Apr '20

19 Apr '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: f48e6f59 by Emmanuel Gil Peyrot at 2020-04-19T07:35:06+02:00 Add typing hints to simplexml - - - - - 1 changed file: - nbxmpp/simplexml.py Changes: ===================================== nbxmpp/simplexml.py ===================================== @@ -18,14 +18,19 @@ nodes and XML streams. I'm personally using it in many other separate projects. It is designed to be as standalone as possible """ +from __future__ import annotations + import logging import xml.parsers.expat from xml.parsers.expat import ExpatError from copy import deepcopy +from typing import Dict, List, Optional, Union, Iterator, Callable, Any + +Attrs = Dict[str, str] log = logging.getLogger('nbxmpp.simplexml') -def XMLescape(txt): +def XMLescape(txt: str) -> str: """ Return provided string with symbols & < > " replaced by their respective XML entities @@ -54,10 +59,19 @@ class Node: on the classes tree). """ - FORCE_NODE_RECREATION = 0 + name: str + namespace: str + attrs: Attrs + data: List[str] + kids: List[Union[Node, str]] + parent: Optional[Node] + nsd: Dict[str, str] + nsp_cache: Dict[Any, Any] - def __init__(self, tag=None, attrs=None, payload=None, parent=None, nsp=None, - node_built=False, node=None): + FORCE_NODE_RECREATION = False + + def __init__(self, tag: Optional[str] = None, attrs: Optional[Attrs] = None, payload: Optional[Union[Node, str, List[Union[Node, str]]]] = None, parent: Optional[Node] = None, nsp: Optional[Dict[Any, Any]] = None, + node_built: bool = False, node: Optional[Union[Node, Any]] = None) -> None: """ Takes "tag" argument as the name of node (prepended by namespace, if needed and separated from it by a space), attrs dictionary as the set of @@ -121,7 +135,7 @@ class Node: else: self.data.append(str(i)) - def lookup_nsp(self, pfx=''): + def lookup_nsp(self, pfx: str = '') -> str: ns = self.nsd.get(pfx, None) if ns is None: ns = self.nsp_cache.get(pfx, None) @@ -133,7 +147,7 @@ class Node: return 'http://www.gajim.org/xmlns/undeclared' return ns - def __str__(self, fancy=0): + def __str__(self, fancy: int = 0) -> str: """ Method used to dump node into textual representation. If "fancy" argument is set to True produces indented output for readability @@ -178,7 +192,7 @@ class Node: s += "\n" return s - def addChild(self, name=None, attrs=None, payload=None, namespace=None, node=None): + def addChild(self, name: Optional[str] = None, attrs: Optional[Attrs] = None, payload: Optional[List[Any]] = None, namespace: Optional[str] = None, node: Optional[Node] = None) -> Node: """ If "node" argument is provided, adds it as child node. Else creates new node from the other arguments' values and adds it as well @@ -199,25 +213,25 @@ class Node: self.kids.append(newnode) return newnode - def addData(self, data): + def addData(self, data: Any) -> None: """ Add some CDATA to node """ self.data.append(str(data)) - def clearData(self): + def clearData(self) -> None: """ Remove all CDATA from the node """ self.data = [] - def delAttr(self, key): + def delAttr(self, key: str) -> None: """ Delete an attribute "key" """ del self.attrs[key] - def delChild(self, node, attrs=None): + def delChild(self, node: Union[Node, str], attrs: Optional[Attrs] = None) -> Optional[Node]: """ Delete the "node" from the node's childs list, if "node" is an instance. Else delete the first node that have specified name and (optionally) @@ -225,10 +239,11 @@ class Node: """ if not isinstance(node, Node): node = self.getTag(node, attrs) + assert isinstance(node, Node) self.kids.remove(node) return node - def getAttrs(self, copy=False): + def getAttrs(self, copy: bool = False) -> Attrs: """ Return all node's attributes as dictionary """ @@ -236,49 +251,49 @@ class Node: return deepcopy(self.attrs) return self.attrs - def getAttr(self, key): + def getAttr(self, key: str) -> Optional[str]: """ Return value of specified attribute """ return self.attrs.get(key) - def getChildren(self): + def getChildren(self) -> List[Union[Node, str]]: """ Return all node's child nodes as list """ return self.kids - def getData(self): + def getData(self) -> str: """ Return all node CDATA as string (concatenated) """ return ''.join(self.data) - def getName(self): + def getName(self) -> str: """ Return the name of node """ return self.name - def getNamespace(self): + def getNamespace(self) -> str: """ Return the namespace of node """ return self.namespace - def getParent(self): + def getParent(self) -> Optional[Node]: """ Returns the parent of node (if present) """ return self.parent - def getPayload(self): + def getPayload(self) -> List[Union[Node, str]]: """ Return the payload of node i.e. list of child nodes and CDATA entries. F.e. for "<node>text1<nodea/><nodeb/> text2</node>" will be returned list: ['text1', <nodea instance>, <nodeb instance>, ' text2'] """ - ret = [] + ret: List[Union[Node, str]] = [] for i in range(len(self.kids)+len(self.data)+1): try: if self.data[i]: @@ -291,33 +306,35 @@ class Node: pass return ret - def getTag(self, name, attrs=None, namespace=None): + def getTag(self, name: str, attrs: Optional[Attrs] = None, namespace: Optional[str] = None) -> Optional[Node]: """ Filter all child nodes using specified arguments as filter. Return the first found or None if not found """ - return self.getTags(name, attrs, namespace, one=1) + tag = self.getTags(name, attrs, namespace, one=True) + assert not isinstance(tag, list) + return tag - def getTagAttr(self, tag, attr, namespace=None): + def getTagAttr(self, tag: str, attr: str, namespace: Optional[str] = None) -> Optional[str]: """ Return attribute value of the child with specified name (or None if no such attribute) """ - try: - return self.getTag(tag, namespace=namespace).attrs[attr] - except Exception: + node = self.getTag(tag, namespace=namespace) + if node is None: return None + return node.getAttr(attr) - def getTagData(self, tag): + def getTagData(self, tag: str) -> Optional[str]: """ Return cocatenated CDATA of the child with specified name """ - try: - return self.getTag(tag).getData() - except Exception: + node = self.getTag(tag) + if node is None: return None + return node.getData() - def getTags(self, name, attrs=None, namespace=None, one=0): + def getTags(self, name: str, attrs: Optional[Attrs] = None, namespace: Optional[str] = None, one: bool = False) -> Union[List[Node], Node, None]: """ Filter all child nodes using specified arguments as filter. Returns the list of nodes found @@ -340,7 +357,7 @@ class Node: return nodes return None - def iterTags(self, name, attrs=None, namespace=None): + def iterTags(self, name: str, attrs: Optional[Attrs] = None, namespace: Optional[str] = None) -> Iterator[Node]: """ Iterate over all children using specified arguments as filter """ @@ -357,31 +374,31 @@ class Node: else: yield node - def setAttr(self, key, val): + def setAttr(self, key: str, val: str) -> None: """ Set attribute "key" with the value "val" """ self.attrs[key] = val - def setData(self, data): + def setData(self, data: Any) -> None: """ Set node's CDATA to provided string. Resets all previous CDATA! """ self.data = [str(data)] - def setName(self, val): + def setName(self, val: str) -> None: """ Change the node name """ self.name = val - def setNamespace(self, namespace): + def setNamespace(self, namespace: str) -> None: """ Changes the node namespace """ self.namespace = namespace - def setParent(self, node): + def setParent(self, node: Node) -> None: """ Set node's parent to "node". WARNING: do not checks if the parent already present and not removes the node from the list of childs of previous @@ -389,7 +406,7 @@ class Node: """ self.parent = node - def setPayload(self, payload, add=0): + def setPayload(self, payload: Union[List[Union[Node, str]], Node, str], add: bool = False) -> None: """ Set node payload according to the list specified. WARNING: completely replaces all node's previous content. If you wish just to add child or @@ -402,17 +419,17 @@ class Node: else: self.kids = payload - def setTag(self, name, attrs=None, namespace=None): + def setTag(self, name: str, attrs: Optional[Attrs] = None, namespace: Optional[str] = None) -> Node: """ Same as getTag but if the node with specified namespace/attributes not found, creates such node and returns it """ - node = self.getTags(name, attrs, namespace=namespace, one=1) + node = self.getTags(name, attrs, namespace=namespace, one=True) if node: return node return self.addChild(name, attrs, namespace=namespace) - def setTagAttr(self, tag, attr, val, namespace=None): + def setTagAttr(self, tag: str, attr: str, val: str, namespace: Optional[str] = None) -> None: """ Create new node (if not already present) with name "tag" and set it's attribute "attr" to value "val" @@ -422,7 +439,7 @@ class Node: except Exception: self.addChild(tag, namespace=namespace, attrs={attr: val}) - def setTagData(self, tag, val, attrs=None): + def setTagData(self, tag: str, val: str, attrs: Optional[Attrs] = None) -> None: """ Creates new node (if not already present) with name "tag" and (optionally) attributes "attrs" and sets it's CDATA to string "val" @@ -432,7 +449,7 @@ class Node: except Exception: self.addChild(tag, attrs, payload = [str(val)]) - def getXmlLang(self): + def getXmlLang(self) -> Optional[str]: lang = self.attrs.get('xml:lang') if lang is not None: return lang @@ -441,37 +458,37 @@ class Node: return self.parent.getXmlLang() return None - def has_attr(self, key): + def has_attr(self, key: str) -> bool: """ Check if node have attribute "key" """ return key in self.attrs - def __getitem__(self, item): + def __getitem__(self, item: str) -> Optional[str]: """ Return node's attribute "item" value """ return self.getAttr(item) - def __setitem__(self, item, val): + def __setitem__(self, item: str, val: str) -> None: """ Set node's attribute "item" value """ - return self.setAttr(item, val) + self.setAttr(item, val) - def __delitem__(self, item): + def __delitem__(self, item: str) -> None: """ Delete node's attribute "item" """ - return self.delAttr(item) + self.delAttr(item) - def __contains__(self, item): + def __contains__(self, item: str) -> bool: """ Check if node has attribute "item" """ return self.has_attr(item) - def __getattr__(self, attr): + def __getattr__(self, attr: str) -> Union['T', 'NT']: """ Reduce memory usage caused by T/NT classes - use memory only when needed """ @@ -533,8 +550,23 @@ class NodeBuilder: XML handler """ - def __init__(self, data=None, initial_node=None, - dispatch_depth=1, finished=True): + _parser: Any + Parse: Callable[[str, bool], None] + __depth: int + __last_depth: int + __max_depth: int + _dispatch_depth: int + _document_attrs: Optional[Attrs] + _document_nsp: Optional[Dict[str, str]] + _mini_dom: Optional[Node] + last_is_data: bool + _ptr: Optional[Node] + data_buffer: Optional[List[str]] + streamError: str + _is_stream: bool + + def __init__(self, data: Optional[str] = None, initial_node: Optional[Node] = None, + dispatch_depth: int = 1, finished: bool = True) -> None: """ Take two optional parameters: "data" and "initial_node" @@ -565,7 +597,7 @@ class NodeBuilder: self._document_attrs = None self._document_nsp = None self._mini_dom = initial_node - self.last_is_data = 1 + self.last_is_data = True self._ptr = None self.data_buffer = None self.streamError = '' @@ -573,13 +605,13 @@ class NodeBuilder: if data: self._parser.Parse(data, finished) - def check_data_buffer(self): + def check_data_buffer(self) -> None: if self.data_buffer: self._ptr.data.append(''.join(self.data_buffer)) del self.data_buffer[:] self.data_buffer = None - def destroy(self): + def destroy(self) -> None: """ Method used to allow class instance to be garbage-collected """ @@ -589,7 +621,7 @@ class NodeBuilder: self._parser.CharacterDataHandler = None self._parser.StartNamespaceDeclHandler = None - def starttag(self, tag, attrs): + def starttag(self, tag: str, attrs: Attrs) -> None: """ XML Parser callback. Used internally """ @@ -627,9 +659,9 @@ class NodeBuilder: raise ValueError(str(e)) if not self.last_is_data and self._ptr.parent: self._ptr.parent.data.append('') - self.last_is_data = 0 + self.last_is_data = False - def _check_stream_start(self, ns, tag): + def _check_stream_start(self, ns: str, tag: str) -> None: if self._is_stream: if ns != 'http://etherx.jabber.org/streams' or tag != 'stream': raise ValueError('Incorrect stream start: (%s,%s). Terminating.' @@ -637,7 +669,7 @@ class NodeBuilder: else: self.stream_header_received() - def endtag(self, tag): + def endtag(self, tag: str) -> None: """ XML Parser callback. Used internally """ @@ -656,70 +688,70 @@ class NodeBuilder: else: log.debug("Got higher than dispatch level. Stream terminated?") self._dec_depth() - self.last_is_data = 0 + self.last_is_data = False if self.__depth == 0: self.stream_footer_received() - def handle_cdata(self, data): + def handle_cdata(self, data: str) -> None: if self.last_is_data: if self.data_buffer: self.data_buffer.append(data) elif self._ptr: self.data_buffer = [data] - self.last_is_data = 1 + self.last_is_data = True @staticmethod - def handle_invalid_xmpp_element(*args): + def handle_invalid_xmpp_element(*args: Any) -> None: raise ExpatError('Found invalid xmpp stream element: %s' % str(args)) - def handle_namespace_start(self, _prefix, _uri): + def handle_namespace_start(self, _prefix: str, _uri: str) -> None: """ XML Parser callback. Used internally """ self.check_data_buffer() - def getDom(self): + def getDom(self) -> Optional[Node]: """ Return just built Node """ self.check_data_buffer() return self._mini_dom - def dispatch(self, stanza): + def dispatch(self, stanza: Any) -> None: """ Get called when the NodeBuilder reaches some level of depth on it's way up with the built node as argument. Can be redefined to convert incoming XML stanzas to program events """ - def stream_header_received(self): + def stream_header_received(self) -> None: """ Method called when stream just opened """ self.check_data_buffer() - def stream_footer_received(self): + def stream_footer_received(self) -> None: """ Method called when stream just closed """ self.check_data_buffer() - def has_received_endtag(self, level=0): + def has_received_endtag(self, level: int = 0) -> bool: """ Return True if at least one end tag was seen (at level) """ return self.__depth <= level < self.__max_depth - def _inc_depth(self): + def _inc_depth(self) -> None: self.__last_depth = self.__depth self.__depth += 1 self.__max_depth = max(self.__depth, self.__max_depth) - def _dec_depth(self): + def _dec_depth(self) -> None: self.__last_depth = self.__depth self.__depth -= 1 -def XML2Node(xml): +def XML2Node(xml: str) -> Optional[Node]: """ Convert supplied textual string into XML node. Handy f.e. for reading configuration file. Raises xml.parser.expat.parsererror if provided string @@ -727,7 +759,7 @@ def XML2Node(xml): """ return NodeBuilder(xml).getDom() -def BadXML2Node(xml): +def BadXML2Node(xml: str) -> Optional[Node]: """ Convert supplied textual string into XML node. Survives if xml data is cutted half way round. I.e. "<html>some text some more text". Will raise View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/f48e6f59858cfa7a836a12f2… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/f48e6f59858cfa7a836a12f2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] EntityCaps: Answer DiscoInfo if there is no node set
by Philipp Hörist 19 Apr '20

19 Apr '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 197813d7 by lovetox at 2020-04-19T07:00:25+02:00 EntityCaps: Answer DiscoInfo if there is no node set - - - - - 1 changed file: - nbxmpp/modules/entity_caps.py Changes: ===================================== nbxmpp/modules/entity_caps.py ===================================== @@ -53,8 +53,9 @@ class EntityCaps(BaseModule): if self._caps is None: return - if self._node != stanza.getQuerynode(): - return + if self._node is not None: + if self._node != stanza.getQuerynode(): + return iq = stanza.buildReply('result') iq.setQuerynode(self._node) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/197813d79753f318714a6c28… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/197813d79753f318714a6c28… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Fix pylint error
by Philipp Hörist 18 Apr '20

18 Apr '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: df300ddd by lovetox at 2020-04-18T21:48:08+02:00 Fix pylint error - - - - - 1 changed file: - nbxmpp/protocol.py Changes: ===================================== nbxmpp/protocol.py ===================================== @@ -22,9 +22,9 @@ import time import hashlib import socket import functools -import idna from base64 import b64encode +import idna from precis_i18n import get_profile from nbxmpp.simplexml import Node View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/df300ddd981d421023472a48… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/df300ddd981d421023472a48… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update mypy.ini
by Philipp Hörist 18 Apr '20

18 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0ca282e6 by lovetox at 2020-04-18T21:45:46+02:00 Update mypy.ini - - - - - 1 changed file: - mypy.ini Changes: ===================================== mypy.ini ===================================== @@ -1,5 +1,5 @@ [mypy] -python_version = 3.5 +python_version = 3.7 warn_unused_configs = True disallow_incomplete_defs = True allow_redefinition = True View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0ca282e669b7e09c6f5c2ea08ba1100b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0ca282e669b7e09c6f5c2ea08ba1100b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Use IDNA2008 for domain validation
by Philipp Hörist 18 Apr '20

18 Apr '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: f6470785 by lovetox at 2020-04-18T21:44:59+02:00 Use IDNA2008 for domain validation - - - - - 3 changed files: - README.md - nbxmpp/protocol.py - setup.cfg Changes: ===================================== README.md ===================================== @@ -9,6 +9,7 @@ - GLib >= 2.60 - libsoup - precis-i18n +- idna ## Features ===================================== nbxmpp/protocol.py ===================================== @@ -22,9 +22,8 @@ import time import hashlib import socket import functools -import stringprep +import idna from base64 import b64encode -from encodings import idna from precis_i18n import get_profile from nbxmpp.simplexml import Node @@ -789,6 +788,9 @@ def validate_resourcepart(resourcepart): @functools.lru_cache(maxsize=4096) def validate_domainpart(domainpart): + if not domainpart: + raise DomainpartByteLimit + # Check if this is a IPV4 address try: socket.inet_aton(domainpart) @@ -804,27 +806,20 @@ def validate_domainpart(domainpart): except Exception: pass - if not domainpart or len(domainpart.encode()) > 1023: - raise DomainpartByteLimit - if domainpart.endswith('.'): # RFC7622, 3.2 domainpart = domainpart[:-1] try: - 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) + domainpart = idna.encode(domainpart) except Exception: raise DomainpartNotAllowedChar + length = len(domainpart) + if length == 0 or length > 1023: + raise DomainpartByteLimit + + return domainpart.decode() + class JID: """ ===================================== setup.cfg ===================================== @@ -15,6 +15,7 @@ python_requires = >=3.7 packages = find: install_requires = precis-i18n>=1.0.0 + idna [options.packages.find] exclude = View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/f64707859b018a0b4ad04aa0… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/f64707859b018a0b4ad04aa0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Refactor get_os_info()
by Philipp Hörist 18 Apr '20

18 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5fe921af by lovetox at 2020-04-18T12:45:16+02:00 Refactor get_os_info() - - - - - 03a482f1 by lovetox at 2020-04-18T16:28:10+02:00 EntityCaps: Add None check - - - - - 3 changed files: - gajim/common/app.py - gajim/common/helpers.py - gajim/common/modules/caps.py Changes: ===================================== gajim/common/app.py ===================================== @@ -71,8 +71,6 @@ logger = cast(LoggerT, None) css_config = None -os_info = None # used to cache os information - transport_type = {} # type: Dict[str, str] # dict of time of the latest incoming message per jid ===================================== gajim/common/helpers.py ===================================== @@ -45,6 +45,8 @@ import logging import json import copy import collections +import platform +import functools from collections import defaultdict import random import weakref @@ -702,21 +704,19 @@ def get_random_string(count=16): allowed = string.ascii_uppercase + string.digits return ''.join(random.choice(allowed) for char in range(count)) +(a)functools.lru_cache(maxsize=1) def get_os_info(): - if app.os_info: - return app.os_info - app.os_info = 'N/A' - if os.name == 'nt' or sys.platform == 'darwin': - import platform - app.os_info = platform.system() + " " + platform.release() - elif os.name == 'posix': + info = 'N/A' + if sys.platform in ('win32', 'darwin'): + info = f'{platform.system()} {platform.release()}' + + elif sys.platform == 'linux': try: import distro - app.os_info = distro.name(pretty=True) + info = distro.name(pretty=True) except ImportError: - import platform - app.os_info = platform.system() - return app.os_info + info = platform.system() + return info def allow_showing_notification(account, type_='notify_on_new_message', is_first_message=True): ===================================== gajim/common/modules/caps.py ===================================== @@ -59,6 +59,9 @@ class Caps(BaseModule): if properties.is_self_presence: return + if properties.entity_caps is None: + return + jid = str(properties.jid) hash_method = properties.entity_caps.hash View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/53af6559ca4374a08ba8e45fb2c5f96… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/53af6559ca4374a08ba8e45fb2c5f96… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
12
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2020