Commits

commits@gajim.org

17632 discussions

python-nbxmpp: more py3 fixes
by Yann Leboulanger 02 Jan '13

02 Jan '13

changeset 220e1936c4d2 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=220e1936c4d2 description: more py3 fixes diffstat: nbxmpp/bosh.py | 12 ++++++------ nbxmpp/client_nb.py | 6 +++--- nbxmpp/dispatcher_nb.py | 8 ++++---- nbxmpp/idlequeue.py | 9 ++++----- nbxmpp/protocol.py | 8 ++++---- nbxmpp/roster_nb.py | 24 ++++++++++++------------ nbxmpp/simplexml.py | 12 ++++++------ nbxmpp/stringprepare.py | 26 +++++++++++++------------- nbxmpp/transports_nb.py | 2 +- 9 files changed, 53 insertions(+), 54 deletions(-) diffs (truncated from 385 to 300 lines): diff -r 5ba63540b68d -r 220e1936c4d2 nbxmpp/bosh.py --- a/nbxmpp/bosh.py Wed Jan 02 13:51:30 2013 +0100 +++ b/nbxmpp/bosh.py Wed Jan 02 14:15:21 2013 +0100 @@ -321,27 +321,27 @@ self.remove_bosh_wait_timeout() if self.after_init: - if stanza_attrs.has_key('sid'): + if 'sid' in stanza_attrs: # session ID should be only in init response self.bosh_sid = stanza_attrs['sid'] - if stanza_attrs.has_key('requests'): + if 'requests' in stanza_attrs: self.bosh_requests = int(stanza_attrs['requests']) - if stanza_attrs.has_key('wait'): + if 'wait' in stanza_attrs: self.bosh_wait = int(stanza_attrs['wait']) self.after_init = False ack = None - if stanza_attrs.has_key('ack'): + if 'ack' in stanza_attrs: ack = stanza_attrs['ack'] self.ack_checker.process_incoming_ack(ack=ack, socket=self.current_recv_socket) - if stanza_attrs.has_key('type'): + if 'type' in stanza_attrs: if stanza_attrs['type'] in ['terminate', 'terminal']: condition = 'n/a' - if stanza_attrs.has_key('condition'): + if 'condition' in stanza_attrs: condition = stanza_attrs['condition'] if condition == 'n/a': log.info('Received sesion-ending terminating stanza') diff -r 5ba63540b68d -r 220e1936c4d2 nbxmpp/client_nb.py --- a/nbxmpp/client_nb.py Wed Jan 02 13:51:30 2013 +0100 +++ b/nbxmpp/client_nb.py Wed Jan 02 14:15:21 2013 +0100 @@ -320,7 +320,7 @@ if not mode: # starting state - if self.__dict__.has_key('Dispatcher'): + if 'Dispatcher' in self.__dict__: self.Dispatcher.PlugOut() self.got_features = False dispatcher_nb.Dispatcher.get_instance().PlugIn(self) @@ -564,7 +564,7 @@ """ Plug in the roster """ - if not self.__dict__.has_key('NonBlockingRoster'): + if 'NonBlockingRoster' not in self.__dict__: return roster_nb.NonBlockingRoster.get_instance(version=version).PlugIn(self) def getRoster(self, on_ready=None, force=False): @@ -572,7 +572,7 @@ Return the Roster instance, previously plugging it in and requesting roster from server if needed """ - if self.__dict__.has_key('NonBlockingRoster'): + if 'NonBlockingRoster' in self.__dict__: return self.NonBlockingRoster.getRoster(on_ready, force) return None diff -r 5ba63540b68d -r 220e1936c4d2 nbxmpp/dispatcher_nb.py --- a/nbxmpp/dispatcher_nb.py Wed Jan 02 13:51:30 2013 +0100 +++ b/nbxmpp/dispatcher_nb.py Wed Jan 02 14:15:21 2013 +0100 @@ -100,17 +100,17 @@ c = '\ufdd0' r = c.encode('utf8') while (c < '\ufdef'): - c = unichr(ord(c) + 1) + c = chr(ord(c) + 1) r += '|' + c.encode('utf8') # \ufffe-\uffff, \u1fffe-\u1ffff, ..., \u10fffe-\u10ffff c = '\ufffe' r += '|' + c.encode('utf8') - r += '|' + unichr(ord(c) + 1).encode('utf8') + r += '|' + chr(ord(c) + 1).encode('utf8') while (c < '\U0010fffe'): - c = unichr(ord(c) + 0x10000) + c = chr(ord(c) + 0x10000) r += '|' + c.encode('utf8') - r += '|' + unichr(ord(c) + 1).encode('utf8') + r += '|' + chr(ord(c) + 1).encode('utf8') self.invalid_chars_re = re.compile(r) diff -r 5ba63540b68d -r 220e1936c4d2 nbxmpp/idlequeue.py --- a/nbxmpp/idlequeue.py Wed Jan 02 13:51:30 2013 +0100 +++ b/nbxmpp/idlequeue.py Wed Jan 02 14:15:21 2013 +0100 @@ -128,8 +128,7 @@ """ Return one line representation of command and its arguments """ - return reduce(lambda left, right: left + ' ' + right, - self._compose_command_args()) + return ' '.join(self._compose_command_args()) def wait_child(self): if self.pipe.poll() is None: @@ -323,7 +322,7 @@ self.queue[fd].read_timeout() self.remove_timeout(fd, timeout) - times = self.alarms.keys() + times = list(self.alarms.keys()) for alarm_time in times: if alarm_time > current_time: continue @@ -478,8 +477,8 @@ self._check_time_events() return True try: - waiting_descriptors = select.select(self.read_fds.keys(), - self.write_fds.keys(), self.error_fds.keys(), 0) + waiting_descriptors = select.select(list(self.read_fds.keys()), + list(self.write_fds.keys()), list(self.error_fds.keys()), 0) except select.error as e: waiting_descriptors = ((), (), ()) if e[0] != 4: # interrupt diff -r 5ba63540b68d -r 220e1936c4d2 nbxmpp/protocol.py --- a/nbxmpp/protocol.py Wed Jan 02 13:51:30 2013 +0100 +++ b/nbxmpp/protocol.py Wed Jan 02 14:15:21 2013 +0100 @@ -761,7 +761,7 @@ if self['from']: self.setFrom(self['from']) if node and type(self) == type(node) and \ - self.__class__ == node.__class__ and self.attrs.has_key('id'): + self.__class__ == node.__class__ and 'id' in self.attrs: del self.attrs['id'] self.timestamp = None for d in self.getTags('delay', namespace=NS_DELAY2): @@ -1550,7 +1550,7 @@ """ Add one more label-option pair to this field """ - if isinstance(opt, basestring): + if isinstance(opt, str): self.addChild('option').setTagData('value', opt) else: self.addChild('option', {'label': opt[0]}).setTagData('value', @@ -1621,7 +1621,7 @@ newdata.append(DataField(name, data[name])) data = newdata for child in data: - if isinstance(child, basestring): + if isinstance(child, str): self.addInstructions(child) elif child.__class__.__name__ == 'DataField': self.kids.append(child) @@ -1695,7 +1695,7 @@ for field in self.getTags('field'): name = field.getAttr('var') typ = field.getType() - if isinstance(typ, basestring) and typ.endswith('-multi'): + if isinstance(typ, str) and typ.endswith('-multi'): val = [] for i in field.getTags('value'): val.append(i.getData()) diff -r 5ba63540b68d -r 220e1936c4d2 nbxmpp/roster_nb.py --- a/nbxmpp/roster_nb.py Wed Jan 02 13:51:30 2013 +0100 +++ b/nbxmpp/roster_nb.py Wed Jan 02 14:15:21 2013 +0100 @@ -86,16 +86,16 @@ for item in query.getTags('item'): jid=item.getAttr('jid') if item.getAttr('subscription')=='remove': - if self._data.has_key(jid): del self._data[jid] + if jid in self._data: del self._data[jid] # Looks like we have a workaround # raise NodeProcessed # a MUST log.info('Setting roster item %s...' % jid) - if not self._data.has_key(jid): self._data[jid]={} + if jid not in self._data: self._data[jid]={} self._data[jid]['name']=item.getAttr('name') self._data[jid]['ask']=item.getAttr('ask') self._data[jid]['subscription']=item.getAttr('subscription') self._data[jid]['groups']=[] - if not self._data[jid].has_key('resources'): self._data[jid]['resources']={} + if 'resources' not in self._data[jid]: self._data[jid]['resources']={} for group in item.getTags('group'): if group.getData() not in self._data[jid]['groups']: self._data[jid]['groups'].append(group.getData()) @@ -116,7 +116,7 @@ # If no from attribue, it's from server jid=self._owner.Server jid=JID(jid) - if not self._data.has_key(jid.getStripped()): self._data[jid.getStripped()]={'name':None,'ask':None,'subscription':'none','groups':['Not in roster'],'resources':{}} + if jid.getStripped() not in self._data: self._data[jid.getStripped()]={'name':None,'ask':None,'subscription':'none','groups':['Not in roster'],'resources':{}} if type(self._data[jid.getStripped()]['resources'])!=type(dict()): self._data[jid.getStripped()]['resources']={} item=self._data[jid.getStripped()] @@ -130,7 +130,7 @@ if pres.getTag('priority'): res['priority']=pres.getPriority() if not pres.getTimestamp(): pres.setTimestamp() res['timestamp']=pres.getTimestamp() - elif typ=='unavailable' and item['resources'].has_key(jid.getResource()): del item['resources'][jid.getResource()] + elif typ=='unavailable' and jid.getResource() in item['resources']: del item['resources'][jid.getResource()] # Need to handle type='error' also def _getItemData(self, jid, dataname): @@ -147,11 +147,11 @@ """ if jid.find('/') + 1: jid, resource = jid.split('/', 1) - if self._data[jid]['resources'].has_key(resource): + if resource in self._data[jid]['resources']: return self._data[jid]['resources'][resource][dataname] - elif self._data[jid]['resources'].keys(): + elif list(self._data[jid]['resources'].keys()): lastpri = -129 - for r in self._data[jid]['resources'].keys(): + for r in list(self._data[jid]['resources'].keys()): if int(self._data[jid]['resources'][r]['priority']) > lastpri: resource, lastpri=r, int(self._data[jid]['resources'][r]['priority']) return self._data[jid]['resources'][resource][dataname] @@ -222,7 +222,7 @@ """ Return list of connected resources of contact 'jid' """ - return self._data[jid[:(jid+'/').find('/')]]['resources'].keys() + return list(self._data[jid[:(jid+'/').find('/')]]['resources'].keys()) def setItem(self, jid, name=None, groups=[]): """ @@ -257,13 +257,13 @@ """ Return list of all [bare] JIDs that the roster is currently tracks """ - return self._data.keys() + return list(self._data.keys()) def keys(self): """ Same as getItems. Provided for the sake of dictionary interface """ - return self._data.keys() + return list(self._data.keys()) def __getitem__(self, item): """ @@ -277,7 +277,7 @@ Get the contact in the internal format (or None if JID 'item' is not in roster) """ - if self._data.has_key(item): + if item in self._data: return self._data[item] def Subscribe(self, jid): diff -r 5ba63540b68d -r 220e1936c4d2 nbxmpp/simplexml.py --- a/nbxmpp/simplexml.py Wed Jan 02 13:51:30 2013 +0100 +++ b/nbxmpp/simplexml.py Wed Jan 02 14:15:21 2013 +0100 @@ -39,14 +39,14 @@ Converts object "what" to unicode string using it's own __str__ method if accessible or unicode method otherwise """ - if isinstance(what, unicode): + if isinstance(what, str): return what try: r = what.__str__() except AttributeError: r = str(what) - if not isinstance(r, unicode): - return unicode(r, ENCODING) + if not isinstance(r, str): + return str(r, ENCODING) return r class Node(object): @@ -124,7 +124,7 @@ self.namespace, self.name = tag.split() else: self.name = tag - if isinstance(payload, basestring): payload=[payload] + if isinstance(payload, str): payload=[payload] for i in payload: if isinstance(i, Node): self.addChild(node=i) @@ -163,7 +163,7 @@ for a in self.kids: if not fancy and (len(self.data)-1)>=cnt: s=s+XMLescape(self.data[cnt]) elif (len(self.data)-1)>=cnt: s=s+XMLescape(self.data[cnt].strip()) - if isinstance(a, str) or isinstance(a, unicode): + if isinstance(a, str) or isinstance(a, str): s = s + a.__str__() else: s = s + a.__str__(fancy and fancy+1) @@ -384,7 +384,7 @@ replaces all node's previous content. If you wish just to add child or CDATA - use addData or addChild methods """ - if isinstance(payload, basestring): + if isinstance(payload, str): payload = [payload]

1 0

python-nbxmpp: hardcode error values in protocol.py
by Yann Leboulanger 02 Jan '13

02 Jan '13

changeset 5ba63540b68d in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=5ba63540b68d description: hardcode error values in protocol.py diffstat: nbxmpp/protocol.py | 376 +++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 308 insertions(+), 68 deletions(-) diffs (truncated from 389 to 300 lines): diff -r 5c97346d371c -r 5ba63540b68d nbxmpp/protocol.py --- a/nbxmpp/protocol.py Wed Jan 02 13:17:03 2013 +0100 +++ b/nbxmpp/protocol.py Wed Jan 02 13:51:30 2013 +0100 @@ -166,77 +166,317 @@ NS_HASHES_SHA256 = 'urn:xmpp:hash-function-textual-names:sha-256' NS_HASHES_SHA512 = 'urn:xmpp:hash-function-textual-names:sha-512' -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_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).''' +#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.''' +#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 = {}, {} -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 - ERRORS[ns + ' ' + cond] = [code, typ, text] - if code: - _errorcodes[code] = cond -del ns, errname, errpool, err, cond, code, typ, text +#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)) + +ERRORS = { + 'urn:ietf:params:xml:ns:xmpp-sasl aborted': ['', + '', + 'The receiving entity acknowledges an <abort/> element sent by the initiating entity; sent in reply to the <abort/> element.'], + 'urn:ietf:params:xml:ns:xmpp-sasl 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.'], + 'urn:ietf:params:xml:ns:xmpp-sasl 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.'], + 'urn:ietf:params:xml:ns:xmpp-sasl 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.'], + 'urn:ietf:params:xml:ns:xmpp-sasl 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.'], + 'urn:ietf:params:xml:ns:xmpp-sasl 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.'], + 'urn:ietf:params:xml:ns:xmpp-sasl 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.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas bad-request': ['400', + 'modify', + 'The sender has sent XML that is malformed or that cannot be processed.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas conflict': ['409', + 'cancel', + 'Access cannot be granted because an existing resource or session exists with the same name or address.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas feature-not-implemented': ['501', + 'cancel', + 'The feature requested is not implemented by the recipient or server and therefore cannot be processed.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas forbidden': ['403', + 'auth', + 'The requesting entity does not possess the required permissions to perform the action.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas gone': ['302', + 'modify', + 'The recipient or server can no longer be contacted at this address.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas internal-server-error': ['500', + 'wait', + 'The server could not process the stanza because of a misconfiguration or an otherwise-undefined internal server error.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas item-not-found': ['404', + 'cancel', + 'The addressed JID or item requested cannot be found.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas 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."], + 'urn:ietf:params:xml:ns:xmpp-stanzas 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.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas not-allowed': ['405', + 'cancel', + 'The recipient or server does not allow any entity to perform the action.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas not-authorized': ['401', + 'auth', + 'The sender must provide proper credentials before being allowed to perform the action, or has provided improper credentials.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas payment-required': ['402', + 'auth', + 'The requesting entity is not authorized to access the requested service because payment is required.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas recipient-unavailable': ['404', + 'wait', + 'The intended recipient is temporarily unavailable.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas redirect': ['302', + 'modify', + 'The recipient or server is redirecting requests for this information to another entity.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas registration-required': ['407', + 'auth', + 'The requesting entity is not authorized to access the requested service because registration is required.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas 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.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas 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.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas resource-constraint': ['500', + 'wait', + 'The server or recipient lacks the system resources necessary to service the request.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas service-unavailable': ['503', + 'cancel', + 'The server or recipient does not currently provide the requested service.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas subscription-required': ['407', + 'auth', + 'The requesting entity is not authorized to access the requested service because a subscription is required.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas undefined-condition': ['500', + '', + 'Undefined Condition'], + 'urn:ietf:params:xml:ns:xmpp-stanzas 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).'], + 'urn:ietf:params:xml:ns:xmpp-streams bad-format': ['', + '', + 'The entity has sent XML that cannot be processed.'], + 'urn:ietf:params:xml:ns:xmpp-streams 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.'], + 'urn:ietf:params:xml:ns:xmpp-streams conflict': ['', + '', + 'The server is closing the active stream for this entity because a new stream has been initiated that conflicts with the existing stream.'], + 'urn:ietf:params:xml:ns:xmpp-streams connection-timeout': ['', + '', + 'The entity has not generated any traffic over the stream for some period of time.'], + 'urn:ietf:params:xml:ns:xmpp-streams 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."], + 'urn:ietf:params:xml:ns:xmpp-streams 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."], + 'urn:ietf:params:xml:ns:xmpp-streams improper-addressing': ['', + '', + "A stanza sent between two servers lacks a 'to' or 'from' attribute (or the attribute has no value)."], + 'urn:ietf:params:xml:ns:xmpp-streams internal-server-error': ['', + '', + 'The server has experienced a misconfiguration or an otherwise-undefined internal error that prevents it from servicing the stream.'], + 'urn:ietf:params:xml:ns:xmpp-streams 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."], + 'urn:ietf:params:xml:ns:xmpp-streams invalid-id': ['', + '', + 'The stream ID or dialback ID is invalid or does not match an ID previously provided.'], + 'urn:ietf:params:xml:ns:xmpp-streams 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".'], + 'urn:ietf:params:xml:ns:xmpp-streams invalid-xml': ['', + '', + 'The entity has sent invalid XML over the stream to a server that performs validation.'], + 'urn:ietf:params:xml:ns:xmpp-streams 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.'], + 'urn:ietf:params:xml:ns:xmpp-streams policy-violation': ['', + '', + 'The entity has violated some local service policy.'], + 'urn:ietf:params:xml:ns:xmpp-streams remote-connection-failed': ['', + '', + 'The server is unable to properly connect to a remote resource that is required for authentication or authorization.'], + 'urn:ietf:params:xml:ns:xmpp-streams resource-constraint': ['', + '', + 'The server lacks the system resources necessary to service the stream.'], + 'urn:ietf:params:xml:ns:xmpp-streams restricted-xml': ['', + '', + 'The entity has attempted to send restricted XML features such as a comment, processing instruction, DTD, entity reference, or unescaped character.'], + 'urn:ietf:params:xml:ns:xmpp-streams see-other-host': ['', + '', + 'The server will not provide service to the initiating entity but is redirecting traffic to another host.'], + 'urn:ietf:params:xml:ns:xmpp-streams system-shutdown': ['', + '', + 'The server is being shut down and all active streams are being closed.'], + 'urn:ietf:params:xml:ns:xmpp-streams undefined-condition': ['', + '',

1 0

python-nbxmpp: port code to python3
by Yann Leboulanger 02 Jan '13

02 Jan '13

changeset 5c97346d371c in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=5c97346d371c description: port code to python3 diffstat: nbxmpp/__init__.py | 12 ++++---- nbxmpp/auth_nb.py | 24 ++++++++-------- nbxmpp/bosh.py | 6 ++-- nbxmpp/c14n.py | 2 +- nbxmpp/client_nb.py | 8 ++-- nbxmpp/dispatcher_nb.py | 30 +++++++++++---------- nbxmpp/features_nb.py | 2 +- nbxmpp/idlequeue.py | 16 +++++----- nbxmpp/protocol.py | 12 +++----- nbxmpp/proxy_connectors.py | 2 +- nbxmpp/roster_nb.py | 4 +- nbxmpp/simplexml.py | 10 +++--- nbxmpp/smacks.py | 4 +- nbxmpp/stringprepare.py | 6 ++-- nbxmpp/tls_nb.py | 64 +++++++++++++++++++++++----------------------- nbxmpp/transports_nb.py | 28 ++++++++++---------- 16 files changed, 115 insertions(+), 115 deletions(-) diffs (truncated from 740 to 300 lines): diff -r b339386c6111 -r 5c97346d371c nbxmpp/__init__.py --- a/nbxmpp/__init__.py Thu Dec 27 19:17:02 2012 -0400 +++ b/nbxmpp/__init__.py Wed Jan 02 13:17:03 2013 +0100 @@ -10,9 +10,9 @@ Thanks and credits to the xmpppy developers. See: http://xmpppy.sourceforge.net/ """ -from protocol import * -import simplexml, protocol, auth_nb, transports_nb, roster_nb -import dispatcher_nb, features_nb, idlequeue, bosh, tls_nb, proxy_connectors -from client_nb import NonBlockingClient -from plugin import PlugIn -from smacks import Smacks +from .protocol import * +from . import simplexml, protocol, auth_nb, transports_nb, roster_nb +from . import dispatcher_nb, features_nb, idlequeue, bosh, tls_nb, proxy_connectors +from .client_nb import NonBlockingClient +from .plugin import PlugIn +from .smacks import Smacks diff -r b339386c6111 -r 5c97346d371c nbxmpp/auth_nb.py --- a/nbxmpp/auth_nb.py Thu Dec 27 19:17:02 2012 -0400 +++ b/nbxmpp/auth_nb.py Wed Jan 02 13:17:03 2013 +0100 @@ -21,15 +21,15 @@ See client_nb.py """ -from protocol import NS_SASL, NS_SESSION, NS_STREAMS, NS_BIND, NS_AUTH -from protocol import NS_STREAM_MGMT -from protocol import Node, NodeProcessed, isResultNode, Iq, Protocol, JID -from plugin import PlugIn -from smacks import Smacks +from .protocol import NS_SASL, NS_SESSION, NS_STREAMS, NS_BIND, NS_AUTH +from .protocol import NS_STREAM_MGMT +from .protocol import Node, NodeProcessed, isResultNode, Iq, Protocol, JID +from .plugin import PlugIn +from .smacks import Smacks import base64 import random import itertools -import dispatcher_nb +from . import dispatcher_nb import hashlib import hmac import hashlib @@ -218,7 +218,7 @@ raise NodeProcessed if "EXTERNAL" in self.mecs: self.mecs.remove('EXTERNAL') - sasl_data = u'%s@%s' % (self.username, self._owner.Server) + sasl_data = '%s@%s' % (self.username, self._owner.Server) sasl_data = sasl_data.encode('utf-8').encode('base64').replace( '\n', '') node = Node('auth', attrs={'xmlns': NS_SASL, @@ -241,7 +241,7 @@ self.startsasl = SASL_IN_PROCESS self._owner.send(str(node)) raise NodeProcessed - except kerberos.GSSError, e: + except kerberos.GSSError as e: log.info('GSSAPI authentication failed: %s' % str(e)) if 'SCRAM-SHA-1' in self.mecs: self.mecs.remove('SCRAM-SHA-1') @@ -486,19 +486,19 @@ self.resp['nc'], self.resp['cnonce'], self.resp['qop'], HH(A2)])) self.resp['response'] = response - sasl_data = u'' + sasl_data = '' for key in ('charset', 'username', 'realm', 'nonce', 'nc', 'cnonce', 'digest-uri', 'response', 'qop'): if key in ('nc', 'qop', 'response', 'charset'): - sasl_data += u"%s=%s," % (key, self.resp[key]) + sasl_data += "%s=%s," % (key, self.resp[key]) else: - sasl_data += u'%s="%s",' % (key, self.resp[key]) + sasl_data += '%s="%s",' % (key, self.resp[key]) sasl_data = sasl_data[:-1].encode('utf-8').encode('base64').replace( '\r', '').replace('\n', '') node = Node('response', attrs={'xmlns': NS_SASL}, payload=[sasl_data]) elif self.mechanism == 'PLAIN': - sasl_data = u'\x00%s\x00%s' % (self.username, self.password) + sasl_data = '\x00%s\x00%s' % (self.username, self.password) sasl_data = sasl_data.encode('utf-8').encode('base64').replace( '\n', '') node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'PLAIN'}, diff -r b339386c6111 -r 5c97346d371c nbxmpp/bosh.py --- a/nbxmpp/bosh.py Thu Dec 27 19:17:02 2012 -0400 +++ b/nbxmpp/bosh.py Wed Jan 02 13:17:03 2013 +0100 @@ -20,11 +20,11 @@ import locale, random from hashlib import sha1 -from transports_nb import NonBlockingTransport, NonBlockingHTTPBOSH,\ +from .transports_nb import NonBlockingTransport, NonBlockingHTTPBOSH,\ CONNECTED, CONNECTING, DISCONNECTED, DISCONNECTING,\ urisplit, DISCONNECT_TIMEOUT_SECONDS -from protocol import BOSHBody, Protocol, NS_CLIENT -from simplexml import Node +from .protocol import BOSHBody, Protocol, NS_CLIENT +from .simplexml import Node import logging log = logging.getLogger('nbxmpp.bosh') diff -r b339386c6111 -r 5c97346d371c nbxmpp/c14n.py --- a/nbxmpp/c14n.py Thu Dec 27 19:17:02 2012 -0400 +++ b/nbxmpp/c14n.py Wed Jan 02 13:17:03 2013 +0100 @@ -22,7 +22,7 @@ XML canonicalisation methods (for XEP-0116) """ -from simplexml import ustr +from .simplexml import ustr def c14n(node, is_buggy): s = "<" + node.name diff -r b339386c6111 -r 5c97346d371c nbxmpp/client_nb.py --- a/nbxmpp/client_nb.py Thu Dec 27 19:17:02 2012 -0400 +++ b/nbxmpp/client_nb.py Wed Jan 02 13:17:03 2013 +0100 @@ -21,8 +21,8 @@ """ import socket -import transports_nb, dispatcher_nb, auth_nb, roster_nb, protocol, bosh -from protocol import NS_TLS +from . import transports_nb, dispatcher_nb, auth_nb, roster_nb, protocol, bosh +from .protocol import NS_TLS import logging log = logging.getLogger('nbxmpp.client_nb') @@ -249,9 +249,9 @@ try: self.ip_addresses = socket.getaddrinfo(hostname, port, socket.AF_UNSPEC, socket.SOCK_STREAM) - except socket.gaierror, (errnum, errstr): + except socket.gaierror as exc: self.disconnect(message='Lookup failure for %s:%s, hostname: %s - %s' % - (self.Server, self.Port, hostname, errstr)) + (self.Server, self.Port, hostname, str(exc))) else: on_success() diff -r b339386c6111 -r 5c97346d371c nbxmpp/dispatcher_nb.py --- a/nbxmpp/dispatcher_nb.py Thu Dec 27 19:17:02 2012 -0400 +++ b/nbxmpp/dispatcher_nb.py Wed Jan 02 13:17:03 2013 +0100 @@ -20,11 +20,13 @@ different handlers to different XMPP stanzas and namespaces """ -import simplexml, sys, locale +from . import simplexml +import sys +import locale import re from xml.parsers.expat import ExpatError -from plugin import PlugIn -from protocol import (NS_STREAMS, NS_XMPP_STREAMS, NS_HTTP_BIND, Iq, Presence, +from .plugin import PlugIn +from .protocol import (NS_STREAMS, NS_XMPP_STREAMS, NS_HTTP_BIND, Iq, Presence, Message, Protocol, Node, Error, ERR_FEATURE_NOT_IMPLEMENTED, StreamError) import logging log = logging.getLogger('nbxmpp.dispatcher_nb') @@ -95,17 +97,17 @@ self.sm = None # \ufddo -> \ufdef range - c = u'\ufdd0' + c = '\ufdd0' r = c.encode('utf8') - while (c < u'\ufdef'): + while (c < '\ufdef'): c = unichr(ord(c) + 1) r += '|' + c.encode('utf8') # \ufffe-\uffff, \u1fffe-\u1ffff, ..., \u10fffe-\u10ffff - c = u'\ufffe' + c = '\ufffe' r += '|' + c.encode('utf8') r += '|' + unichr(ord(c) + 1).encode('utf8') - while (c < u'\U0010fffe'): + while (c < '\U0010fffe'): c = unichr(ord(c) + 0x10000) r += '|' + c.encode('utf8') r += '|' + unichr(ord(c) + 1).encode('utf8') @@ -198,7 +200,7 @@ % (tag, ns)) def replace_non_character(self, data): - return re.sub(self.invalid_chars_re, u'\ufffd'.encode('utf-8'), data) + return re.sub(self.invalid_chars_re, '\ufffd'.encode('utf-8'), data) def ProcessNonBlocking(self, data): """ @@ -220,7 +222,7 @@ handler(self) if len(self._pendingExceptions) > 0: _pendingException = self._pendingExceptions.pop() - raise _pendingException[0], _pendingException[1], _pendingException[2] + raise _pendingException try: self.Stream.Parse(data) # end stream:stream tag received @@ -231,13 +233,13 @@ log.error('Invalid XML received from server. Forcing disconnect.') self._owner.Connection.disconnect() return 0 - except ValueError, e: + except ValueError as e: log.debug('ValueError: %s' % str(e)) self._owner.Connection.pollend() return 0 if len(self._pendingExceptions) > 0: _pendingException = self._pendingExceptions.pop() - raise _pendingException[0], _pendingException[1], _pendingException[2] + raise _pendingException if len(data) == 0: return '0' return len(data) @@ -474,7 +476,7 @@ (cb, args)) try: cb(session,stanza,**args) - except Exception, typ: + except Exception as typ: if typ.__class__.__name__ != 'NodeProcessed': raise else: @@ -486,7 +488,7 @@ if user or handler['system']: try: handler['func'](session, stanza) - except Exception, typ: + except Exception as typ: if typ.__class__.__name__ != 'NodeProcessed': self._pendingExceptions.insert(0, sys.exc_info()) return @@ -552,7 +554,7 @@ sure stanzas get ID and from tag. """ ID = None - if type(stanza) not in [type(''), type(u'')]: + if type(stanza) != str: if isinstance(stanza, Protocol): ID = stanza.getID() if ID is None: diff -r b339386c6111 -r 5c97346d371c nbxmpp/features_nb.py --- a/nbxmpp/features_nb.py Thu Dec 27 19:17:02 2012 -0400 +++ b/nbxmpp/features_nb.py Wed Jan 02 13:17:03 2013 +0100 @@ -20,7 +20,7 @@ (Registration, Privacy Lists, ...) """ -from protocol import NS_REGISTER, NS_PRIVACY, NS_DATA, Iq, isResultNode, Node +from .protocol import NS_REGISTER, NS_PRIVACY, NS_DATA, Iq, isResultNode, Node def _on_default_response(disp, iq, cb): def _on_response(resp): diff -r b339386c6111 -r 5c97346d371c nbxmpp/idlequeue.py --- a/nbxmpp/idlequeue.py Thu Dec 27 19:17:02 2012 -0400 +++ b/nbxmpp/idlequeue.py Wed Jan 02 13:17:03 2013 +0100 @@ -25,7 +25,7 @@ # needed for get_idleqeue try: - import gobject + from gi.repository import GObject HAVE_GOBJECT = True except ImportError: HAVE_GOBJECT = False @@ -190,7 +190,7 @@ def pollin(self): try: res = self.pipe.read() - except Exception, e: + except Exception as e: res = '' if res == '': return self.pollend() @@ -424,7 +424,7 @@ return True try: waiting_descriptors = self.selector.poll(0) - except select.error, e: + except select.error as e: waiting_descriptors = [] if e[0] != 4: # interrupt raise @@ -480,7 +480,7 @@ try: waiting_descriptors = select.select(self.read_fds.keys(), self.write_fds.keys(), self.error_fds.keys(), 0) - except select.error, e: + except select.error as e: waiting_descriptors = ((), (), ()) if e[0] != 4: # interrupt raise @@ -517,15 +517,15 @@ self.events = {} # time() is already called in glib, we just get the last value # overrides IdleQueue.current_time()

1 0

gajim: fix gtk warning in chat_control
by Denis Fomin 01 Jan '13

01 Jan '13

changeset 093f965f539c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=093f965f539c description: fix gtk warning in chat_control diffstat: data/gui/chat_control.ui | 78 +++++++++++++++++++++++++++-------------------- 1 files changed, 45 insertions(+), 33 deletions(-) diffs (232 lines): diff -r f3dd09919ec6 -r 093f965f539c data/gui/chat_control.ui --- a/data/gui/chat_control.ui Tue Jan 01 19:58:57 2013 +0400 +++ b/data/gui/chat_control.ui Wed Jan 02 00:31:13 2013 +0400 @@ -81,30 +81,36 @@ <child> <object class="GtkImage" id="mood_image"> <property name="no_show_all">True</property> - <property name="stock">None</property> + <property name="stock">gtk-missing-image</property> <property name="icon-size">1</property> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkImage" id="activity_image"> <property name="no_show_all">True</property> - <property name="stock">None</property> + <property name="stock">gtk-missing-image</property> <property name="icon-size">1</property> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkImage" id="tune_image"> <property name="no_show_all">True</property> - <property name="stock">None</property> + <property name="stock">gtk-missing-image</property> <property name="icon-size">1</property> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">2</property> </packing> </child> @@ -115,7 +121,7 @@ <child> <object class="GtkImage" id="location_image"> <property name="no_show_all">True</property> - <property name="stock">None</property> + <property name="stock">gtk-missing-image</property> <property name="icon-size">1</property> </object> </child> @@ -128,21 +134,25 @@ </child> <child> <object class="GtkImage" id="audio_banner_image"> - <property name="visible">True</property> - <property name="stock">None</property> + <property name="no_show_all">True</property> + <property name="stock">gtk-missing-image</property> <property name="icon-size">1</property> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">4</property> </packing> </child> <child> <object class="GtkImage" id="video_banner_image"> - <property name="visible">True</property> - <property name="stock">None</property> + <property name="no_show_all">True</property> + <property name="stock">gtk-missing-image</property> <property name="icon-size">1</property> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">5</property> </packing> </child> @@ -155,6 +165,8 @@ </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">6</property> </packing> </child> @@ -172,7 +184,7 @@ <child> <object class="GtkImage" id="avatar_image"> <property name="visible">True</property> - <property name="stock">None</property> + <property name="stock">gtk-missing-image</property> </object> </child> </object> @@ -712,8 +724,8 @@ <property name="relief">none</property> </object> <packing> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="x_options"/> + <property name="y_options"/> </packing> </child> <child> @@ -727,8 +739,8 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="x_options"/> + <property name="y_options"/> </packing> </child> <child> @@ -742,8 +754,8 @@ <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="x_options"/> + <property name="y_options"/> </packing> </child> <child> @@ -757,8 +769,8 @@ <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="x_options"/> + <property name="y_options"/> </packing> </child> <child> @@ -774,8 +786,8 @@ <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="x_options"/> + <property name="y_options"/> </packing> </child> <child> @@ -791,8 +803,8 @@ <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="x_options"/> + <property name="y_options"/> </packing> </child> <child> @@ -806,8 +818,8 @@ <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="x_options"/> + <property name="y_options"/> </packing> </child> <child> @@ -823,8 +835,8 @@ <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="x_options"/> + <property name="y_options"/> </packing> </child> <child> @@ -840,8 +852,8 @@ <property name="right_attach">3</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="x_options"/> + <property name="y_options"/> </packing> </child> <child> @@ -855,8 +867,8 @@ <packing> <property name="top_attach">3</property> <property name="bottom_attach">4</property> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="x_options"/> + <property name="y_options"/> </packing> </child> <child> @@ -872,8 +884,8 @@ <property name="right_attach">2</property> <property name="top_attach">3</property> <property name="bottom_attach">4</property> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="x_options"/> + <property name="y_options"/> </packing> </child> <child> @@ -889,8 +901,8 @@ <property name="right_attach">3</property> <property name="top_attach">3</property> <property name="bottom_attach">4</property> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="x_options"/> + <property name="y_options"/> </packing> </child> </object>

1 0

gajim: typo
by Denis Fomin 01 Jan '13

01 Jan '13

changeset f3dd09919ec6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f3dd09919ec6 description: typo diffstat: src/statusicon.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r ab854000f4fd -r f3dd09919ec6 src/statusicon.py --- a/src/statusicon.py Tue Jan 01 19:46:04 2013 +0400 +++ b/src/statusicon.py Tue Jan 01 19:58:57 2013 +0400 @@ -299,7 +299,7 @@ connected_accounts_with_private_storage += 1 # for single message - single_message_menuitemset_submenu(None) + single_message_menuitem.set_submenu(None) self.single_message_handler_id = single_message_menuitem.\ connect('activate', self.on_single_message_menuitem_activate, account)

1 0

gajim: fix SeparatorMenuItem
by Denis Fomin 01 Jan '13

01 Jan '13

changeset ab854000f4fd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ab854000f4fd description: fix SeparatorMenuItem diffstat: src/chat_control.py | 8 ++++---- src/conversation_textview.py | 4 ++-- src/groupchat_control.py | 2 +- src/gui_menu_builder.py | 2 +- src/roster_window.py | 30 +++++++++++++++--------------- src/statusicon.py | 8 ++++---- 6 files changed, 27 insertions(+), 27 deletions(-) diffs (261 lines): diff -r 61963a47b20b -r ab854000f4fd src/chat_control.py --- a/src/chat_control.py Tue Jan 01 18:34:30 2013 +0400 +++ b/src/chat_control.py Tue Jan 01 19:46:04 2013 +0400 @@ -525,7 +525,7 @@ """ Override the default context menu and add our own menutiems """ - item = Gtk.SeparatorMenuItem() + item = Gtk.SeparatorMenuItem.new() menu.prepend(item) menu2 = self.prepare_context_menu() @@ -573,7 +573,7 @@ id_ = item.connect('activate', self.msg_textview.undo) self.handlers[id_] = item - item = Gtk.SeparatorMenuItem() + item = Gtk.SeparatorMenuItem.new() menu.prepend(item) item = Gtk.ImageMenuItem(Gtk.STOCK_CLEAR) @@ -1066,7 +1066,7 @@ menuitem[1]) menu.append(item) - item = Gtk.SeparatorMenuItem() # separator + item = Gtk.SeparatorMenuItem.new() # separator menu.append(item) item = Gtk.ImageMenuItem(_('Color')) @@ -1081,7 +1081,7 @@ item.connect('activate', self.on_font_menuitem_activale) menu.append(item) - item = Gtk.SeparatorMenuItem() # separator + item = Gtk.SeparatorMenuItem.new() # separator menu.append(item) item = Gtk.ImageMenuItem(_('Clear formating')) diff -r 61963a47b20b -r ab854000f4fd src/conversation_textview.py --- a/src/conversation_textview.py Tue Jan 01 18:34:30 2013 +0400 +++ b/src/conversation_textview.py Tue Jan 01 19:46:04 2013 +0400 @@ -728,7 +728,7 @@ """ separator_menuitem_was_added = False if not self.used_in_history_window: - item = Gtk.SeparatorMenuItem() + item = Gtk.SeparatorMenuItem.new() menu.prepend(item) separator_menuitem_was_added = True @@ -739,7 +739,7 @@ if self.selected_phrase: if not separator_menuitem_was_added: - item = Gtk.SeparatorMenuItem() + item = Gtk.SeparatorMenuItem.new() menu.prepend(item) if not self.used_in_history_window: diff -r 61963a47b20b -r ab854000f4fd src/groupchat_control.py --- a/src/groupchat_control.py Tue Jan 01 18:34:30 2013 +0400 +++ b/src/groupchat_control.py Tue Jan 01 19:46:04 2013 +0400 @@ -563,7 +563,7 @@ and the ability to insert a nick """ ChatControlBase.on_msg_textview_populate_popup(self, textview, menu) - item = Gtk.SeparatorMenuItem() + item = Gtk.SeparatorMenuItem.new() menu.prepend(item) item = Gtk.MenuItem(_('Insert Nickname')) diff -r 61963a47b20b -r ab854000f4fd src/gui_menu_builder.py --- a/src/gui_menu_builder.py Tue Jan 01 18:34:30 2013 +0400 +++ b/src/gui_menu_builder.py Tue Jan 01 19:46:04 2013 +0400 @@ -136,7 +136,7 @@ contacts_transport == gajim.get_transport_name_from_jid(room_jid): rooms.append((room_jid, acct)) if len(rooms): - item = Gtk.SeparatorMenuItem() # separator + item = Gtk.SeparatorMenuItem.new() # separator invite_to_submenu.append(item) for (room_jid, account) in rooms: menuitem = Gtk.MenuItem(room_jid.split('@')[0]) diff -r 61963a47b20b -r ab854000f4fd src/roster_window.py --- a/src/roster_window.py Tue Jan 01 18:34:30 2013 +0400 +++ b/src/roster_window.py Tue Jan 01 19:46:04 2013 +0400 @@ -5470,7 +5470,7 @@ item.set_sensitive(False) # Manage GC bookmarks - newitem = Gtk.SeparatorMenuItem() # separator + newitem = Gtk.SeparatorMenuItem.new() # separator gc_sub_menu.append(newitem) newitem = Gtk.ImageMenuItem(_('_Manage Bookmarks...')) @@ -5579,7 +5579,7 @@ status_menuitem.set_submenu(sub_menu) for show in ('online', 'chat', 'away', 'xa', 'dnd', 'invisible'): - uf_show = helpers.get_uf_show(show, use_mnemonic=True) + uf_show = helpers.get_uf_show(show, use_mnemonic=False) item = Gtk.ImageMenuItem(uf_show) icon = state_images[show] item.set_image(icon) @@ -5591,7 +5591,7 @@ else: item.connect('activate', self.change_status, account, show) - item = Gtk.SeparatorMenuItem() + item = Gtk.SeparatorMenuItem.new() sub_menu.append(item) item = Gtk.ImageMenuItem(_('_Change Status Message')) @@ -5602,7 +5602,7 @@ if gajim.connections[account].connected < 2: item.set_sensitive(False) - item = Gtk.SeparatorMenuItem() + item = Gtk.SeparatorMenuItem.new() sub_menu.append(item) uf_show = helpers.get_uf_show('offline', use_mnemonic=True) @@ -5633,7 +5633,7 @@ self.on_publish_location_toggled) pep_config = Gtk.ImageMenuItem(_('Configure Services...')) - item = Gtk.SeparatorMenuItem() + item = Gtk.SeparatorMenuItem.new() pep_submenu.append(item) pep_config.set_sensitive(True) pep_submenu.append(pep_config) @@ -5699,7 +5699,7 @@ sub_menu.append(item) item.connect('activate', self.change_status, account, show) - item = Gtk.SeparatorMenuItem() + item = Gtk.SeparatorMenuItem.new() sub_menu.append(item) item = Gtk.ImageMenuItem(_('_Change Status Message')) @@ -5853,7 +5853,7 @@ send_group_message_item.set_sensitive(False) if not group in helpers.special_groups: - item = Gtk.SeparatorMenuItem() # separator + item = Gtk.SeparatorMenuItem.new() # separator menu.append(item) # Rename @@ -5979,7 +5979,7 @@ gui_menu_builder.build_invite_submenu(invite_item, list_) menu.append(invite_item) - item = Gtk.SeparatorMenuItem() # separator + item = Gtk.SeparatorMenuItem.new() # separator menu.append(item) # Manage Transport submenu @@ -5998,7 +5998,7 @@ manage_contacts_submenu.append(edit_groups_item) edit_groups_item.connect('activate', self.on_edit_groups, list_) - item = Gtk.SeparatorMenuItem() # separator + item = Gtk.SeparatorMenuItem.new() # separator manage_contacts_submenu.append(item) # Block @@ -6090,7 +6090,7 @@ status_menuitems.append(status_menuitem) menu.append(send_custom_status_menuitem) - item = Gtk.SeparatorMenuItem() # separator + item = Gtk.SeparatorMenuItem.new() # separator menu.append(item) # Execute Command @@ -6131,7 +6131,7 @@ if gajim.account_is_disconnected(account): item.set_sensitive(False) - item = Gtk.SeparatorMenuItem() # separator + item = Gtk.SeparatorMenuItem.new() # separator manage_transport_submenu.append(item) # Block @@ -6157,7 +6157,7 @@ if gajim.account_is_disconnected(account): item.set_sensitive(False) - item = Gtk.SeparatorMenuItem() # separator + item = Gtk.SeparatorMenuItem.new() # separator menu.append(item) # Information @@ -6207,7 +6207,7 @@ account) menu.append(disconnect_menuitem) - item = Gtk.SeparatorMenuItem() # separator + item = Gtk.SeparatorMenuItem.new() # separator menu.append(item) history_menuitem = Gtk.ImageMenuItem(_('_History')) @@ -6284,7 +6284,7 @@ """ Add a seperator and History Manager menuitem BELOW for account menuitems """ - item = Gtk.SeparatorMenuItem() # separator + item = Gtk.SeparatorMenuItem.new() # separator menu.append(item) # History manager @@ -6308,7 +6308,7 @@ # User has at least one bookmark. if gajim.connections[account].bookmarks: - item = Gtk.SeparatorMenuItem() + item = Gtk.SeparatorMenuItem.new() gc_sub_menu.append(item) for bookmark in gajim.connections[account].bookmarks: diff -r 61963a47b20b -r ab854000f4fd src/statusicon.py --- a/src/statusicon.py Tue Jan 01 18:34:30 2013 +0400 +++ b/src/statusicon.py Tue Jan 01 19:46:04 2013 +0400 @@ -235,7 +235,7 @@ sub_menu.append(item) item.connect('activate', self.on_show_menuitem_activate, show) - item = Gtk.SeparatorMenuItem() + item = Gtk.SeparatorMenuItem.new() sub_menu.append(item) item = Gtk.ImageMenuItem(_('_Change Status Message...')) @@ -249,7 +249,7 @@ connected_accounts_with_private_storage = 0 - item = Gtk.SeparatorMenuItem() + item = Gtk.SeparatorMenuItem.new() sub_menu.append(item) uf_show = helpers.get_uf_show('offline', use_mnemonic = True) @@ -336,7 +336,7 @@ gc_item.set_submenu(gc_menuitem_menu) gc_sub_menu.show_all() - newitem = Gtk.SeparatorMenuItem() # separator + newitem = Gtk.SeparatorMenuItem.new() # separator gc_sub_menu.append(newitem) newitem = Gtk.ImageMenuItem(_('_Manage Bookmarks...')) img = Gtk.Image.new_from_stock(Gtk.STOCK_PREFERENCES, Gtk.IconSize.MENU) @@ -363,7 +363,7 @@ if os.name == 'nt': if self.added_hide_menuitem is False: - self.systray_context_menu.prepend(Gtk.SeparatorMenuItem()) + self.systray_context_menu.prepend(Gtk.SeparatorMenuItem.new()) item = Gtk.MenuItem(_('Hide this menu')) self.systray_context_menu.prepend(item) self.added_hide_menuitem = True

1 0

gajim: fix dubble click on a boolean value in ACE
by Denis Fomin 01 Jan '13

01 Jan '13

changeset 61963a47b20b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=61963a47b20b description: fix dubble click on a boolean value in ACE diffstat: src/advanced_configuration_window.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diffs (25 lines): diff -r 089a02130c1a -r 61963a47b20b src/advanced_configuration_window.py --- a/src/advanced_configuration_window.py Tue Jan 01 17:56:24 2013 +0400 +++ b/src/advanced_configuration_window.py Tue Jan 01 18:34:30 2013 +0400 @@ -141,7 +141,8 @@ """ optname = model[iter_][C_PREFNAME] opttype = model[iter_][C_TYPE] - if opttype == self.types['boolean'] or optname == 'password': + + if opttype.decode('utf-8') == self.types['boolean'] or optname == 'password': cell.set_property('editable', False) else: cell.set_property('editable', True) @@ -194,9 +195,9 @@ modelpath = self.modelfilter.convert_path_to_child_path(path) modelrow = self.model[modelpath] option = modelrow[0].decode('utf-8') - if modelrow[2] == self.types['boolean']: + if modelrow[2].decode('utf-8') == self.types['boolean']: for key in self.right_true_dict.keys(): - if self.right_true_dict[key] == modelrow[1]: + if self.right_true_dict[key] == modelrow[1].decode('utf-8'): modelrow[1] = str(key) newval = {'False': True, 'True': False}[modelrow[1]] if len(modelpath.get_indices()) > 1:

1 0

gajim: fix status treeview
by Denis Fomin 01 Jan '13

01 Jan '13

changeset 089a02130c1a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=089a02130c1a description: fix status treeview diffstat: src/config.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r ec8c0c9e69bb -r 089a02130c1a src/config.py --- a/src/config.py Tue Jan 01 12:45:38 2013 +0100 +++ b/src/config.py Tue Jan 01 17:56:24 2013 +0400 @@ -437,7 +437,7 @@ self.fill_msg_treeview() buf = self.xml.get_object('msg_textview').get_buffer() - buf.connect('changed', self.on_msg_textview_changed) + buf.connect('end-user-action', self.on_msg_textview_changed) ### Audio / Video tab ### def create_av_combobox(opt_name, device_dict, config_name=None,

1 0

gajim: fix some windows
by Yann Leboulanger 01 Jan '13

01 Jan '13

changeset ec8c0c9e69bb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ec8c0c9e69bb description: fix some windows diffstat: data/gui/preferences_window.ui | 590 +++++++++++++++++++++++++++++++++------- src/config.py | 25 +- 2 files changed, 490 insertions(+), 125 deletions(-) diffs (truncated from 2605 to 300 lines): diff -r 83bd227fa4f9 -r ec8c0c9e69bb data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Tue Jan 01 11:54:39 2013 +0100 +++ b/data/gui/preferences_window.ui Tue Jan 01 12:45:38 2013 +0100 @@ -1,18 +1,17 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.16"/> -  +  <object class="GtkAdjustment" id="adjustment1"> - <property name="value">20</property> <property name="lower">1</property> <property name="upper">1440</property> + <property name="value">20</property> <property name="step_increment">1</property> <property name="page_increment">10</property> </object> <object class="GtkAdjustment" id="adjustment2"> - <property name="value">12</property> <property name="lower">1</property> <property name="upper">720</property> + <property name="value">12</property> <property name="step_increment">1</property> <property name="page_increment">10</property> </object> @@ -149,58 +148,82 @@ </row> </data> </object> + <object class="GtkListStore" id="status_message_liststore"> + <columns> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> + </columns> + </object> <object class="GtkWindow" id="preferences_window"> + <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes">Preferences</property> <property name="role">preferences</property> <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_preferences_window_destroy"/> - <signal name="key_press_event" handler="on_preferences_window_key_press_event"/> + <signal name="destroy" handler="on_preferences_window_destroy" swapped="no"/> + <signal name="key-press-event" handler="on_preferences_window_key_press_event" swapped="no"/> <child> <object class="GtkVBox" id="vbox13"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkNotebook" id="preferences_notebook"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="show_border">False</property> - <signal name="switch_page" handler="on_preferences_notebook_switch_page"/> + <signal name="switch-page" handler="on_preferences_notebook_switch_page" swapped="no"/> <child> <object class="GtkVBox" id="vbox41"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">12</property> - <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkFrame" id="frame1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="border_width">6</property> <property name="left_padding">12</property> <child> <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="show_avatars_in_roster_checkbutton"> <property name="label" translatable="yes">Display a_vatars of contacts in roster</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will display avatars of contacts in roster window and in group chats</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_avatars_in_roster_checkbutton_toggled"/> + <signal name="toggled" handler="on_show_avatars_in_roster_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -211,13 +234,16 @@ <child> <object class="GtkCheckButton" id="show_status_msgs_in_roster_checkbutton"> <property name="label" translatable="yes">Display status _messages of contacts in roster</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_status_msgs_in_roster_checkbutton_toggled"/> + <signal name="toggled" handler="on_show_status_msgs_in_roster_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -228,13 +254,16 @@ <child> <object class="GtkCheckButton" id="show_mood_in_roster_checkbutton"> <property name="label" translatable="yes">Display m_ood of contacts in roster</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will display the mood of contacts in the roster window</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_mood_in_roster_checkbutton_toggled"/> + <signal name="toggled" handler="on_show_mood_in_roster_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -245,13 +274,16 @@ <child> <object class="GtkCheckButton" id="show_activity_in_roster_checkbutton"> <property name="label" translatable="yes">Display _activity of contacts in roster</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will display the activity of contacts in the roster window</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_activity_in_roster_checkbutton_toggled"/> + <signal name="toggled" handler="on_show_activity_in_roster_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -262,13 +294,16 @@ <child> <object class="GtkCheckButton" id="show_tunes_in_roster_checkbutton"> <property name="label" translatable="yes">Display _tunes of contacts in roster</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will display the tunes of contacts in the roster window</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_tunes_in_roster_checkbutton_toggled"/> + <signal name="toggled" handler="on_show_tunes_in_roster_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -279,14 +314,17 @@ <child> <object class="GtkCheckButton" id="show_location_in_roster_checkbutton"> <property name="label" translatable="yes">Display _location of contacts in roster</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will display the location of contacts in the roster window</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_location_in_roster_checkbutton_toggled"/> + <signal name="toggled" handler="on_show_location_in_roster_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -297,48 +335,62 @@ <child> <object class="GtkHBox" id="hbox3"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label10"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Sort contacts by status</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkCheckButton" id="sort_by_show_in_roster_checkbutton"> <property name="label" translatable="yes">in _roster</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_sort_by_show_in_roster_checkbutton_toggled"/> + <signal name="toggled" handler="on_sort_by_show_in_roster_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkCheckButton" id="sort_by_show_in_muc_checkbutton"> <property name="label" translatable="yes">in _group chats</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_sort_by_show_in_muc_checkbutton_toggled"/> + <signal name="toggled" handler="on_sort_by_show_in_muc_checkbutton_toggled" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">6</property> </packing> </child> @@ -349,6 +401,7 @@ <child type="label"> <object class="GtkLabel" id="label1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes"><b>Roster Appearance</b></property> <property name="use_markup">True</property> @@ -357,24 +410,28 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkFrame" id="frame2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>

1 0

gajim: fix some windows
by Yann Leboulanger 01 Jan '13

01 Jan '13

changeset 83bd227fa4f9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=83bd227fa4f9 description: fix some windows diffstat: src/config.py | 4 ++-- src/gajim_themes_window.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diffs (36 lines): diff -r f25e1421b8b0 -r 83bd227fa4f9 src/config.py --- a/src/config.py Tue Jan 01 11:46:13 2013 +0100 +++ b/src/config.py Tue Jan 01 11:54:39 2013 +0100 @@ -1343,8 +1343,8 @@ col = Gtk.TreeViewColumn('Proxies') self.proxies_treeview.append_column(col) renderer = Gtk.CellRendererText() - col.pack_start(renderer, True, True, 0) - col.set_attributes(renderer, text = 0) + col.pack_start(renderer, True) + col.add_attribute(renderer, 'text', 0) self.fill_proxies_treeview() self.xml.get_object('proxytype_combobox').set_active(0) diff -r f25e1421b8b0 -r 83bd227fa4f9 src/gajim_themes_window.py --- a/src/gajim_themes_window.py Tue Jan 01 11:46:13 2013 +0100 +++ b/src/gajim_themes_window.py Tue Jan 01 11:54:39 2013 +0100 @@ -23,6 +23,7 @@ ## from gi.repository import Gtk +from gi.repository import Gdk from gi.repository import Pango import dialogs import gtkgui_helpers @@ -59,8 +60,8 @@ col = Gtk.TreeViewColumn(_('Theme')) self.themes_tree.append_column(col) renderer = Gtk.CellRendererText() - col.pack_start(renderer, True, True, 0) - col.set_attributes(renderer, text = 0) + col.pack_start(renderer, True) + col.add_attribute(renderer, 'text', 0) renderer.connect('edited', self.on_theme_cell_edited) renderer.set_property('editable', True) self.current_theme = gajim.config.get('roster_theme')

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