summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author4ndreaSt4gi <stagi.andrea@gmail.com>2011-03-23 20:02:47 +0100
committer4ndreaSt4gi <stagi.andrea@gmail.com>2011-03-23 20:02:47 +0100
commit3635593913c4889a04b9eec80db65b87b15d6ca8 (patch)
treed32fee01c9922f28403a0faac427bcf0644c9296
parent0c924078c93eae0bd8947fdf406e383240aef035 (diff)
Adding groups now works.
-rw-r--r--papyon/msnp2p/filetransfer.py4
-rw-r--r--papyon/service/AddressBook/scenario/groups/group_add.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/papyon/msnp2p/filetransfer.py b/papyon/msnp2p/filetransfer.py
index 568e9f7..a89614b 100644
--- a/papyon/msnp2p/filetransfer.py
+++ b/papyon/msnp2p/filetransfer.py
@@ -86,7 +86,7 @@ class FileTransferSession(P2PSession):
self._filename = unicode(context[20:570], "utf-16-le").rstrip("\x00")
if(self._has_preview):
- self._preview=context[574:]
+ self._preview = context[574:]
except:
raise FTParseError(context)
@@ -96,7 +96,7 @@ class FileTransferSession(P2PSession):
context = struct.pack("<5I", 574, 2, self._size, 0, int(self._has_preview))
context += struct.pack("550s", filename)
context += "\xFF" * 4
- if(self._data!=None):
+ if(self._data != None):
context += self._data
return context
diff --git a/papyon/service/AddressBook/scenario/groups/group_add.py b/papyon/service/AddressBook/scenario/groups/group_add.py
index ba7d57f..a1f5504 100644
--- a/papyon/service/AddressBook/scenario/groups/group_add.py
+++ b/papyon/service/AddressBook/scenario/groups/group_add.py
@@ -34,5 +34,5 @@ class GroupAddScenario(BaseScenario):
self.group_name = group_name
def execute(self):
- self.__ab.GroupAdd(self.callback, self._errback,
+ self.__ab.GroupAdd(self._callback, self._errback,
self._scenario, self.group_name)