copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix coding style: use 'is' operator when comparing object to None. put space around '%' operator. remove redundant str() on arguments.

Browse source
This commit is contained in:
Zhenchao Li 2010-06-14 21:21:22 +08:00
parent 5f96675d56
commit e61e5db0b7
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/common/jingle_ft.py
View file

@ -42,12 +42,12 @@ class JingleFileTransfer(JingleContent):
self.callbacks['transport-info'] += [self.__on_transport_info] self.callbacks['transport-info'] += [self.__on_transport_info]
self.file_props = file_props self.file_props = file_props
if file_props == None: if file_props is None:
self.weinitiate = False self.weinitiate = False
else: else:
self.weinitiate = True self.weinitiate = True
if self.file_props != None: if self.file_props is not None:
self.file_props['sender'] = session.ourjid self.file_props['sender'] = session.ourjid
self.file_props['session-type'] = 'jingle' self.file_props['session-type'] = 'jingle'
self.file_props['sid'] = session.sid self.file_props['sid'] = session.sid
@ -56,7 +56,7 @@ class JingleFileTransfer(JingleContent):
log.info("FT request: %s" % file_props) log.info("FT request: %s" % file_props)
if transport == None: if transport is None:
self.transport = JingleTransportICEUDP() self.transport = JingleTransportICEUDP()
self.session = session self.session = session

2
src/common/protocol/bytestream.py
View file

@ -156,7 +156,7 @@ class ConnectionBytestream:
field = _feature.setField('stream-method') field = _feature.setField('stream-method')
field.delAttr('type') field.delAttr('type')
field.setValue(xmpp.NS_BYTESTREAM) field.setValue(xmpp.NS_BYTESTREAM)
log.info("send_file_approval: %s"%(str(iq))) log.info("send_file_approval: %s" % iq)
self.connection.send(iq) self.connection.send(iq)
def send_file_rejection(self, file_props, code='403', typ=None): def send_file_rejection(self, file_props, code='403', typ=None):