commit 3c24f311a4e74bdf72d960c2b949b6a878cf5153 Author: David Fifield david@bamsoftware.com Date: Tue Jul 30 16:24:25 2013 -0700

Fix the safe_str comment.

Found by Arlo.

https://trac.torproject.org/projects/tor/attachment/ticket/9170/0001-Don-t-l... --- facilitator/facilitator | 2 +- facilitator/facilitator-email-poller | 2 +- facilitator/facilitator-reg-daemon | 2 +- flashproxy-client | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/facilitator/facilitator b/facilitator/facilitator index cd3473a..4049dc6 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -63,7 +63,7 @@ again. Listen on 127.0.0.1 and port PORT (by default %(port)d). }

def safe_str(s): - """Return s if options.safe_logging is true, and "[scrubbed]" otherwise.""" + """Return "[scrubbed]" if options.safe_logging is true, and s otherwise.""" if options.safe_logging: return "[scrubbed]" else: diff --git a/facilitator/facilitator-email-poller b/facilitator/facilitator-email-poller index f520033..2b03799 100755 --- a/facilitator/facilitator-email-poller +++ b/facilitator/facilitator-email-poller @@ -120,7 +120,7 @@ them, and forwards the registrations to the facilitator. }

def safe_str(s): - """Return s if options.safe_logging is true, and "[scrubbed]" otherwise.""" + """Return "[scrubbed]" if options.safe_logging is true, and s otherwise.""" if options.safe_logging: return "[scrubbed]" else: diff --git a/facilitator/facilitator-reg-daemon b/facilitator/facilitator-reg-daemon index bf39696..73d9199 100755 --- a/facilitator/facilitator-reg-daemon +++ b/facilitator/facilitator-reg-daemon @@ -61,7 +61,7 @@ single process. }

def safe_str(s): - """Return s if options.safe_logging is true, and "[scrubbed]" otherwise.""" + """Return "[scrubbed]" if options.safe_logging is true, and s otherwise.""" if options.safe_logging: return "[scrubbed]" else: diff --git a/flashproxy-client b/flashproxy-client index 41d6559..5c6f9e0 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -132,7 +132,7 @@ omitted, it uses a public default. }

def safe_str(s): - """Return s if options.safe_logging is true, and "[scrubbed]" otherwise.""" + """Return "[scrubbed]" if options.safe_logging is true, and s otherwise.""" if options.safe_logging: return "[scrubbed]" else: