commit c4013bc8a5ba0c48d8f752bdffd67d96a01c84d7 Author: Isis Lovecruft isis@torproject.org Date: Thu Jun 4 02:32:57 2015 +0000

Minor cleanup for PluggableTransport._runChecks() changes from ad7b5f9a. --- lib/bridgedb/bridges.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 4e9ecd1..91b62fa 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -372,19 +372,16 @@ class PluggableTransport(BridgeAddressBase): ("Cannot create PluggableTransport with arguments type: %s") % type(self.arguments))

- for k, v in self.arguments.items(): - kv = ''.join((k, v)) + for item in self.arguments.items(): + kv = ''.join(item) if not isascii_noncontrol(kv): raise MalformedPluggableTransport( ("Cannot create PluggableTransport with non-ASCII or " - "control characters in arguments: %r=%r") - % (k, v)) + "control characters in arguments: %r=%r") % item) if '"' in kv or '\' in kv: raise MalformedPluggableTransport( ("Cannot create PluggableTransport with double quotes or " - "backslashes in arguments: %r=%r") - % (k, v)) - pass + "backslashes in arguments: %r=%r") % item)

if not self._checkArguments(): raise MalformedPluggableTransport(