From 464f62d58056a639852fdce56bae336b9a63a8cc Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Mon, 20 Oct 2008 15:20:51 +0000 Subject: [thorstenp] remove statements without effect --- src/common/socks5.py | 3 +-- src/common/xmpp/session.py | 1 - src/ipython_view.py | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/common/socks5.py b/src/common/socks5.py index 55cdc4369..0ba13de02 100644 --- a/src/common/socks5.py +++ b/src/common/socks5.py @@ -485,8 +485,7 @@ class Socks5: return -1 def get_file_contents(self, timeout): - ''' read file contents from socket and write them to file ''', \ - self.file_props['type'], self.file_props['sid'] + ''' read file contents from socket and write them to file ''' if self.file_props is None or \ ('file-name' in self.file_props) is False: self.file_props['error'] = -2 diff --git a/src/common/xmpp/session.py b/src/common/xmpp/session.py index 1850e2499..010dccba9 100644 --- a/src/common/xmpp/session.py +++ b/src/common/xmpp/session.py @@ -249,7 +249,6 @@ class Session: features=Node('stream:features') if NS_TLS in self.waiting_features: features.T.starttls.setNamespace(NS_TLS) - features.T.starttls.T.required if NS_SASL in self.waiting_features: features.T.mechanisms.setNamespace(NS_SASL) for mec in self._owner.SASL.mechanisms: diff --git a/src/ipython_view.py b/src/ipython_view.py index 8ee34b294..caf4d5f54 100644 --- a/src/ipython_view.py +++ b/src/ipython_view.py @@ -214,7 +214,7 @@ class IterableIPShell: possibilities = self.IP.complete(split_line[-1]) try: - __builtins__.all + all(()) except AttributeError: def all(iterable): for element in iterable: -- cgit v1.2.3