Update style of client strings.

(imported from commit 1516461cf53b2715de68e01f16bb8a8cc33c48ad)

api/README.md

@@ -49,7 +49,7 @@ At the top of the file:
 
     # Make sure the Zulip API distribution's root directory is in sys.path, then:
     import zulip
-    zulip_client = zulip.Client(email="your-bot@example.com")
+    zulip_client = zulip.Client(email="your-bot@example.com", client="MyTestClient/0.1")
 
 When you want to send a message:
 

api/integrations/asana/zulip_asana_mirror

@@ -48,7 +48,7 @@ else:
     logging.basicConfig(level=logging.INFO)
 
 client = zulip.Client(email=config.ZULIP_USER, api_key=config.ZULIP_API_KEY,
-                      site=config.ZULIP_SITE, client="asana " + VERSION)
+                      site=config.ZULIP_SITE, client="ZulipAsana/" + VERSION)
 
 def fetch_from_asana(path):
     """

api/integrations/basecamp/zulip_basecamp_mirror

@@ -48,7 +48,7 @@ client = zulip.Client(
     email=config.ZULIP_USER,
     site=config.ZULIP_SITE,
     api_key=config.ZULIP_API_KEY,
-    client="basecamp " + VERSION)
+    client="ZulipBasecamp/" + VERSION)
 user_agent = "Basecamp To Zulip Mirroring script (support@zulip.com)"
 htmlParser = HTMLParser()
 

api/integrations/codebase/zulip_codebase_mirror

@@ -51,7 +51,7 @@ client = zulip.Client(
     email=config.ZULIP_USER,
     site=config.ZULIP_SITE,
     api_key=config.ZULIP_API_KEY,
-    client="codebase " + VERSION)
+    client="ZulipCodebase/" + VERSION)
 user_agent = "Codebase To Zulip Mirroring script (support@zulip.com)"
 
 # find some form of JSON loader/dumper, with a preference order for speed.

api/integrations/git/post-receive

@@ -46,7 +46,7 @@ client = zulip.Client(
     email=config.ZULIP_USER,
     site=config.ZULIP_SITE,
     api_key=config.ZULIP_API_KEY,
-    client="git " + VERSION)
+    client="ZulipGit/" + VERSION)
 
 # check_output is backported from subprocess.py in Python 2.7
 def check_output(*popenargs, **kwargs):

api/integrations/hg/zulip-changegroup.py

@@ -87,7 +87,7 @@ def send_zulip(email, api_key, site, stream, subject, content):
     """
     client = zulip.Client(email=email, api_key=api_key,
                           site=site,
-                          client="mercurial " + VERSION)
+                          client="ZulipMercurial/" + VERSION)
 
     message_data = {
         "type": "stream",

api/integrations/nagios/nagios-notify-zulip

@@ -15,7 +15,7 @@ for opt in ('type', 'host', 'service', 'state'):
     parser.add_option('--' + opt)
 (opts, args) = parser.parse_args()
 
-client = zulip.Client(config_file=opts.config, client="nagios " + VERSION)
+client = zulip.Client(config_file=opts.config, client="ZulipNagios/" + VERSION)
 
 msg = dict(type='stream', to=opts.stream)
 

api/integrations/perforce/zulip_change-commit.py

@@ -52,7 +52,8 @@ import zulip
 client = zulip.Client(
     email=config.ZULIP_USER,
     site=config.ZULIP_SITE,
-    api_key=config.ZULIP_API_KEY)
+    api_key=config.ZULIP_API_KEY,
+    client="ZulipPerforce/" + __version__)
 
 try:
     changelist = int(sys.argv[1])

api/integrations/rss/rss-bot

@@ -164,7 +164,7 @@ except IOError:
     log_error_and_exit("Unable to read feed file at %s." % (opts.feed_file,))
 
 client = zulip.Client(email=opts.email, api_key=opts.api_key,
-                       site=opts.site, client="rss " + VERSION)
+                       site=opts.site, client="ZulipRSS/" + VERSION)
 
 first_message = True
 

api/integrations/svn/post-commit

@@ -46,7 +46,7 @@ client = zulip.Client(
     email=config.ZULIP_USER,
     site=config.ZULIP_SITE,
     api_key=config.ZULIP_API_KEY,
-    client="svn " + VERSION)
+    client="ZulipSVN/" + VERSION)
 svn = pysvn.Client()
 
 path, rev = sys.argv[1:]

api/integrations/trac/zulip_trac.py

@@ -50,7 +50,7 @@ client = zulip.Client(
     email=config.ZULIP_USER,
     site=config.ZULIP_SITE,
     api_key=config.ZULIP_API_KEY,
-    client="trac " + VERSION)
+    client="ZulipTrac/" + VERSION)
 
 def markdown_ticket_url(ticket, heading="ticket"):
     return "[%s #%s](%s/%s)" % (heading, ticket.id, config.TRAC_BASE_TICKET_URL, ticket.id)

api/integrations/twitter/twitter-bot

@@ -129,7 +129,7 @@ client = zulip.Client(
     email=options.email,
     api_key=options.api_key,
     site=options.site,
-    client="twitter " + VERSION,
+    client="ZulipTwitter/" + VERSION,
     verbose=True)
 
 if since_id < 0 or options.twitter_id != user_id:

api/integrations/twitter/twitter-search-bot

@@ -146,7 +146,7 @@ client = zulip.Client(
     email=opts.email,
     api_key=opts.api_key,
     site=opts.site,
-    client="twitter search " + VERSION,
+    client="ZulipTwitterSearch/" + VERSION,
     verbose=True)
 
 search_query = " OR ".join(opts.search_terms.split(","))

bots/check-mirroring

@@ -43,7 +43,7 @@ zulip_client = zulip.Client(
     email=zulip_user,
     api_key="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
     verbose=True,
-    client="test: Zulip monitoring",
+    client="ZulipMonitoring/0.1",
     site=options.site)
 
 # Configure logging

bots/sync-public-streams

@@ -10,7 +10,7 @@ import unicodedata
 sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'api'))
 import zulip
 
-zulip_client = zulip.Client()
+zulip_client = zulip.Client(client="ZulipSyncPublicStreamsBot/0.1")
 
 def fetch_public_streams():
     public_streams = set()

bots/tddium-notify-humbug

@@ -49,6 +49,7 @@ sys.path.append(zulip_directory)
 import zulip
 
 client = zulip.Client(
+    client  = "ZulipTddiumNotifier/0.1",
     email   = os.environ['ZULIP_USER'],
     api_key = os.environ.get('ZULIP_API_KEY'))
 

puppet/zulip_internal/files/nagios_plugins/check_send_receive_time

@@ -108,14 +108,14 @@ zulip_sender = zulip.Client(
     email=sender.email,
     api_key=sender.api_key,
     verbose=True,
-    client="test: Zulip monitoring",
+    client="ZulipMonitoring/0.1",
     site=site)
 
 zulip_recipient = zulip.Client(
     email=recipient.email,
     api_key=recipient.api_key,
     verbose=True,
-    client="test: Zulip monitoring",
+    client="ZulipMonitoring/0.1",
     site=site)
 
 try:

tools/inject-messages/inject-messages

@@ -35,6 +35,7 @@ next_user = gen_next_user()
 def connect_all(users):
     for user in users:
         users[user]['client'] = zulip.Client(
+            client="ZulipMessageInjector/0.1",
             email=user + '@zulip.com',
             api_key=users[user]['api-key'],
             site=options.site,

tools/review

@@ -388,7 +388,7 @@ def main(args):
     return 2
 
   if not opts.stdout:
-    client = zulip.Client(verbose=True)
+    client = zulip.Client(verbose=True, client="ZulipReview/0.1")
 
     if 'staging' not in client.base_url:
       print '''

tools/send_github_payloads.py

@@ -6,7 +6,7 @@ import simplejson
 sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'api'))
 import zulip
 
-zulip_client = zulip.Client(site="http://localhost:9991")
+zulip_client = zulip.Client(site="http://localhost:9991", client="ZulipGithubPayloadSender/0.1")
 
 payload_dir = "zerver/fixtures/github"
 for filename in os.listdir(payload_dir):

zerver/management/commands/email-mirror.py

@@ -61,17 +61,20 @@ except UserProfile.DoesNotExist:
 
 if settings.DEPLOYED:
     prod_api_client = zulip.Client(
+            client="ZulipEmailMirror/0.1",
             site="https://zulip.com",
             email=settings.EMAIL_GATEWAY_BOT,
             api_key=api_key)
 
 
     api_client = zulip.Client(
+            client="ZulipEmailMirror/0.1",
             site=settings.EXTERNAL_API_URI,
             email=settings.EMAIL_GATEWAY_BOT,
             api_key=api_key)
 else:
     api_client = prod_api_client = zulip.Client(
+            client="ZulipEmailMirror/0.1",
             site=settings.EXTERNAL_API_URI,
             email=settings.EMAIL_GATEWAY_BOT,
             api_key=api_key)

zerver/worker/queue_processors.py

@@ -183,6 +183,7 @@ def make_feedback_client():
     sys.path.append(os.path.join(os.path.dirname(__file__), '../../api'))
     import zulip
     return zulip.Client(
+        client="ZulipFeedback/0.1",
         email=settings.DEPLOYMENT_ROLE_NAME,
         api_key=settings.DEPLOYMENT_ROLE_KEY,
         verbose=True,