[telepathy-butterfly/master] Removed code to fix base64 padding (now in papyon)
Louis-Francis Ratté-Boulianne
louis-francis.ratte-boulianne at collabora.co.uk
Thu Sep 10 06:48:14 PDT 2009
---
butterfly/media/stream_handler.py | 26 ++------------------------
1 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/butterfly/media/stream_handler.py b/butterfly/media/stream_handler.py
index fc7ce74..6a566c0 100644
--- a/butterfly/media/stream_handler.py
+++ b/butterfly/media/stream_handler.py
@@ -229,36 +229,14 @@ class ButterflyStreamHandler (
elif c.type == "relay":
type = 2
else:
- print "TYPE", c.type
type = 0
- #FIXME
- if c.username:
- while True:
- try:
- base64.b64decode(c.username)
- break
- except:
- c.username += "="
- else:
- c.username = ""
- if c.password:
- while True:
- try:
- base64.b64decode(c.password)
- break
- except:
- c.password += "="
- else:
- c.password = ""
if c.priority is not None:
preference = float(c.priority) / 65536.0
else:
preference = 1.0
- transport = (c.component_id, c.ip, c.port, proto,
- self._session.subtype, "AVP", preference, type, c.username,
- c.password)
+ transport = (c.component_id, c.ip, c.port, proto, self._session.subtype,
+ "AVP", preference, type, c.username, c.password)
array.setdefault(c.foundation, []).append(transport)
- print array
return array.items()
def convert_tp_candidate(self, id, transport):
--
1.5.6.5
More information about the telepathy-commits
mailing list