commit e5dd34164888767126b3430530733bca6460e7cd Author: David Fifield <david@bamsoftware.com> Date: Mon Apr 29 23:52:43 2013 -0700 Formatting. --- flashproxy-reg-email | 6 ++---- flashproxy-reg-url | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/flashproxy-reg-email b/flashproxy-reg-email index f5ab0d0..b2e5ba4 100755 --- a/flashproxy-reg-email +++ b/flashproxy-reg-email @@ -82,8 +82,7 @@ def get_facilitator_pubkey(): if options.facilitator_pubkey_filename is not None: return RSA.load_pub_key(options.facilitator_pubkey_filename) else: - return RSA.load_pub_key_bio( - BIO.MemoryBuffer(DEFAULT_FACILITATOR_PUBKEY_PEM)) + return RSA.load_pub_key_bio(BIO.MemoryBuffer(DEFAULT_FACILITATOR_PUBKEY_PEM)) class options(object): remote_addr = None @@ -190,8 +189,7 @@ options.remote_addr = (DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT) options.email_addr = DEFAULT_EMAIL_ADDRESS options.smtp_addr = (DEFAULT_SMTP_HOST, DEFAULT_SMTP_PORT) -opts, args = getopt.gnu_getopt(sys.argv[1:], "46de:hs:", - ["debug", "email=", "facilitator-pubkey=", "help", "smtp="]) +opts, args = getopt.gnu_getopt(sys.argv[1:], "46de:hs:", ["debug", "email=", "facilitator-pubkey=", "help", "smtp="]) for o, a in opts: if o == "-4": options.address_family = socket.AF_INET diff --git a/flashproxy-reg-url b/flashproxy-reg-url index 548e965..e8aa61a 100755 --- a/flashproxy-reg-url +++ b/flashproxy-reg-url @@ -27,8 +27,7 @@ def get_facilitator_pubkey(): if options.facilitator_pubkey_filename is not None: return RSA.load_pub_key(options.facilitator_pubkey_filename) else: - return RSA.load_pub_key_bio( - BIO.MemoryBuffer(DEFAULT_FACILITATOR_PUBKEY_PEM)) + return RSA.load_pub_key_bio(BIO.MemoryBuffer(DEFAULT_FACILITATOR_PUBKEY_PEM)) class options(object): facilitator_url = None @@ -105,8 +104,7 @@ def format_addr(addr): options.facilitator_url = DEFAULT_FACILITATOR_URL -opt, args = getopt.gnu_getopt(sys.argv[1:], "f:h", - ["facilitator=", "facilitator-pubkey=", "help"]) +opt, args = getopt.gnu_getopt(sys.argv[1:], "f:h", ["facilitator=", "facilitator-pubkey=", "help"]) for o, a in opt: if o == "-f" or o == "--facilitator": options.facilitator_url = a