From b88df2cf8eea0d6a57453291ee4c6a9162a23d35 Mon Sep 17 00:00:00 2001 From: Keegan McAllister Date: Sat, 27 Oct 2012 11:36:55 -0400 Subject: [PATCH] Change default site in API clients (imported from commit 185cf8e27cb6ecd1cd8ccca834d30ca0de2236b8) --- bots/check-mirroring | 2 +- bots/feedback-bot | 2 +- bots/gcal-bot | 4 ++-- bots/zephyr_mirror.py | 2 +- common.py | 2 +- examples/curl-examples | 6 +++--- examples/get-public-streams | 2 +- examples/get-subscriptions | 2 +- examples/print-messages | 2 +- examples/print-next-message | 2 +- examples/send-message | 2 +- examples/subscribe | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/bots/check-mirroring b/bots/check-mirroring index 5e1d384..a5caa47 100755 --- a/bots/check-mirroring +++ b/bots/check-mirroring @@ -16,7 +16,7 @@ parser.add_option('--verbose', action='store_true') parser.add_option('--site', dest='site', - default="https://app.humbughq.com", + default="https://humbughq.com", action='store') (options, args) = parser.parse_args() diff --git a/bots/feedback-bot b/bots/feedback-bot index 66ac1d1..292bde5 100755 --- a/bots/feedback-bot +++ b/bots/feedback-bot @@ -12,7 +12,7 @@ Example: feedback-bot --site=http://127.0.0.1:9991 parser = optparse.OptionParser(usage=usage) parser.add_option('--site', dest='site', - default="https://app.humbughq.com", + default="https://humbughq.com", action='store') (options, args) = parser.parse_args() diff --git a/bots/gcal-bot b/bots/gcal-bot index 73fad9a..91b4c13 100755 --- a/bots/gcal-bot +++ b/bots/gcal-bot @@ -48,9 +48,9 @@ parser.add_option('--calendar', metavar='URL') parser.add_option('--site', dest='site', - default="https://app.humbughq.com", + default="https://humbughq.com", action='store', - help='Humbug site [default: https://app.humbughq.com]', + help='Humbug site [default: https://humbughq.com]', metavar='URL') parser.add_option('--interval', dest='interval', diff --git a/bots/zephyr_mirror.py b/bots/zephyr_mirror.py index bc02d23..5c75c05 100755 --- a/bots/zephyr_mirror.py +++ b/bots/zephyr_mirror.py @@ -46,7 +46,7 @@ parser.add_option('--no-auto-subscribe', action='store_false') parser.add_option('--site', dest='site', - default="https://app.humbughq.com", + default="https://humbughq.com", action='store') parser.add_option('--user', dest='user', diff --git a/common.py b/common.py index 9b6ee43..96e710b 100644 --- a/common.py +++ b/common.py @@ -11,7 +11,7 @@ assert(requests.__version__ > '0.12') class HumbugAPI(): def __init__(self, email, api_key, verbose=False, retry_on_errors=True, - site="https://app.humbughq.com", client="API"): + site="https://humbughq.com", client="API"): self.api_key = api_key self.email = email self.verbose = verbose diff --git a/examples/curl-examples b/examples/curl-examples index 4d1cf4c..aa74fd5 100755 --- a/examples/curl-examples +++ b/examples/curl-examples @@ -1,14 +1,14 @@ #!/bin/sh # Two quick API tests using curl -curl https://app.humbughq.com/api/v1/send_message \ +curl https://humbughq.com/api/v1/send_message \ -d "api-key=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" \ -d "email=tabbott@humbughq.com" \ -d "type=personal" -d "content=test" \ -d "recipient=tabbott@humbughq.com" -curl https://app.humbughq.com/api/v1/get_messages \ +curl https://humbughq.com/api/v1/get_messages \ -d "api-key=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" \ -d "email=tabbott@humbughq.com" -# Or replace https://app.humbughq.com with your local test instance +# Or replace https://humbughq.com with your local test instance diff --git a/examples/get-public-streams b/examples/get-public-streams index a7b080c..95e3b27 100755 --- a/examples/get-public-streams +++ b/examples/get-public-streams @@ -12,7 +12,7 @@ Example: get-public-streams --user=tabbott@humbughq.com --site=http://127.0.0.1: parser = optparse.OptionParser(usage=usage) parser.add_option('--site', dest='site', - default="https://app.humbughq.com", + default="https://humbughq.com", action='store') parser.add_option('--api-key', dest='api_key', diff --git a/examples/get-subscriptions b/examples/get-subscriptions index b51c435..70472f2 100755 --- a/examples/get-subscriptions +++ b/examples/get-subscriptions @@ -12,7 +12,7 @@ Example: get-subscriptions --user=tabbott@humbughq.com --site=http://127.0.0.1:8 parser = optparse.OptionParser(usage=usage) parser.add_option('--site', dest='site', - default="https://app.humbughq.com", + default="https://humbughq.com", action='store') parser.add_option('--api-key', dest='api_key', diff --git a/examples/print-messages b/examples/print-messages index bca6078..44fffba 100755 --- a/examples/print-messages +++ b/examples/print-messages @@ -12,7 +12,7 @@ Example: print-messages --user=tabbott@humbughq.com --site=http://127.0.0.1:8000 parser = optparse.OptionParser(usage=usage) parser.add_option('--site', dest='site', - default="https://app.humbughq.com", + default="https://humbughq.com", action='store') parser.add_option('--api-key', dest='api_key', diff --git a/examples/print-next-message b/examples/print-next-message index 2645b34..3be6f44 100755 --- a/examples/print-next-message +++ b/examples/print-next-message @@ -12,7 +12,7 @@ Example: print-next-messages --user=tabbott@humbughq.com --site=http://127.0.0.1 parser = optparse.OptionParser(usage=usage) parser.add_option('--site', dest='site', - default="https://app.humbughq.com", + default="https://humbughq.com", action='store') parser.add_option('--api-key', dest='api_key', diff --git a/examples/send-message b/examples/send-message index e220a65..9c4e60f 100755 --- a/examples/send-message +++ b/examples/send-message @@ -12,7 +12,7 @@ Example: send-message --user=tabbott@humbughq.com --site=http://127.0.0.1:8000 parser = optparse.OptionParser(usage=usage) parser.add_option('--site', dest='site', - default="https://app.humbughq.com", + default="https://humbughq.com", action='store') parser.add_option('--api-key', dest='api_key', diff --git a/examples/subscribe b/examples/subscribe index 05f588d..beea5bc 100755 --- a/examples/subscribe +++ b/examples/subscribe @@ -12,7 +12,7 @@ Example: subscribe --user=tabbott@humbughq.com --site=http://127.0.0.1:8000 parser = optparse.OptionParser(usage=usage) parser.add_option('--site', dest='site', - default="https://app.humbughq.com", + default="https://humbughq.com", action='store') parser.add_option('--api-key', dest='api_key',