[Telepathy-commits] [mingle/master] Remove unnecessary assert, dead code and spacing failures

[Sjoerd Simons]

---
 jingle.py |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/jingle.py b/jingle.py
index d1166e1..9007169 100644
--- a/jingle.py
+++ b/jingle.py
@@ -265,7 +265,7 @@ class JingleBaseTransport:
         self.state = JingleBaseTransport.PREPARING
 
     def prepare(self, fssession, contact):
-        d =  self.content.session.conference.get_stream (fssession, contact)
+        d = self.content.session.conference.get_stream (fssession, contact)
         d.addCallback (self.got_stream)
 
         return d
@@ -329,7 +329,6 @@ class JingleBaseTransport:
                     self.connected_deferred = None
 
     def initiate(self):
-        assert self.transmitter != None
         self.fsstream.componentStateChanged.addCallback(False,
             self.component_state_changed)
         self.state = JingleBaseTransport.INITIATING
@@ -805,13 +804,11 @@ class JingleBaseSession:
         iq = IQ(self.client.stream, 'set')
         iq['to'] = self.remote_jid.full()
         jingle = self.add_jingle_stanza(iq, 'session-accept')
-        dlist = []
         for c in self.contents.itervalues():
             c.add_content(jingle)
             c.accepted()
         iq.send()
 
-
     def handle_session_initiate(self, iq, contact):
         mtypes = { "audio": farsight.MEDIA_TYPE_AUDIO,
                    "video": farsight.MEDIA_TYPE_VIDEO }
-- 
1.5.6.5