From b0325fef5b924a0d743337845de1284ad8864cae Mon Sep 17 00:00:00 2001 From: Steven Oud Date: Sun, 4 Oct 2015 18:56:26 +0200 Subject: [PATCH] Consistently use /usr/bin/env python2.7 in shebangs and commands. --- bin/zulip-send | 2 +- bots/check-mirroring | 2 +- bots/check-rabbitmq-consumers | 2 +- bots/check-rabbitmq-queue | 2 +- bots/cron_file_helper.py | 2 +- bots/gcal-bot | 2 +- bots/irc-mirror.py | 6 +++--- bots/jabber_mirror.py | 2 +- bots/jabber_mirror_backend.py | 2 +- bots/log2zulip | 2 +- bots/process_ccache | 2 +- bots/sync-public-streams | 2 +- bots/tddium-notify-humbug | 2 +- bots/zephyr_mirror.py | 2 +- bots/zephyr_mirror_backend.py | 2 +- examples/create-user | 2 +- examples/edit-message | 2 +- examples/get-public-streams | 2 +- examples/list-members | 2 +- examples/list-subscriptions | 2 +- examples/print-events | 2 +- examples/print-messages | 2 +- examples/print-next-message | 2 +- examples/send-message | 2 +- examples/subscribe | 2 +- examples/unsubscribe | 2 +- integrations/asana/zulip_asana_config.py | 2 +- integrations/asana/zulip_asana_mirror | 2 +- integrations/basecamp/zulip_basecamp_config.py | 2 +- integrations/basecamp/zulip_basecamp_mirror | 2 +- integrations/codebase/zulip_codebase_config.py | 2 +- integrations/codebase/zulip_codebase_mirror | 2 +- integrations/git/post-receive | 2 +- integrations/git/zulip_git_config.py | 2 +- integrations/hg/zulip-changegroup.py | 2 +- integrations/nagios/nagios-notify-zulip | 2 +- integrations/perforce/git_p4.py | 2 +- integrations/perforce/zulip_change-commit.py | 2 +- integrations/perforce/zulip_perforce_config.py | 2 +- integrations/rss/rss-bot | 2 +- integrations/svn/post-commit | 2 +- integrations/svn/zulip_svn_config.py | 2 +- integrations/twitter/twitter-bot | 2 +- integrations/twitter/twitter-search-bot | 2 +- setup.py | 2 +- 45 files changed, 47 insertions(+), 47 deletions(-) diff --git a/bin/zulip-send b/bin/zulip-send index 3cd31ad..b314863 100755 --- a/bin/zulip-send +++ b/bin/zulip-send @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # -*- coding: utf-8 -*- # zulip-send -- Sends a message to the specified recipients. diff --git a/bots/check-mirroring b/bots/check-mirroring index 50a4718..bfc5588 100755 --- a/bots/check-mirroring +++ b/bots/check-mirroring @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 import sys import time import optparse diff --git a/bots/check-rabbitmq-consumers b/bots/check-rabbitmq-consumers index fd3661b..4f4c7ff 100755 --- a/bots/check-rabbitmq-consumers +++ b/bots/check-rabbitmq-consumers @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 import sys import time diff --git a/bots/check-rabbitmq-queue b/bots/check-rabbitmq-queue index 5c9af8d..ba359f3 100755 --- a/bots/check-rabbitmq-queue +++ b/bots/check-rabbitmq-queue @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 import sys import re diff --git a/bots/cron_file_helper.py b/bots/cron_file_helper.py index 7aa6460..b61609c 100644 --- a/bots/cron_file_helper.py +++ b/bots/cron_file_helper.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 import time def nagios_from_file(results_file): diff --git a/bots/gcal-bot b/bots/gcal-bot index ff33d7b..90b92aa 100755 --- a/bots/gcal-bot +++ b/bots/gcal-bot @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 import sys import time import datetime diff --git a/bots/irc-mirror.py b/bots/irc-mirror.py index b5102ad..40af27a 100644 --- a/bots/irc-mirror.py +++ b/bots/irc-mirror.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python2.7 # # EXPERIMENTAL # IRC <=> Zulip mirroring bot @@ -92,11 +92,11 @@ class IRCBot(irc.bot.SingleServerIRCBot): return self.dcc_connect(address, port) -usage = """python irc-mirror.py --server=IRC_SERVER --channel= --nick-prefix= [optional args] +usage = """python2.7 irc-mirror.py --server=IRC_SERVER --channel= --nick-prefix= [optional args] Example: -python irc-mirror.py --irc-server=127.0.0.1 --channel='#test' --nick-prefix=username +python2.7 irc-mirror.py --irc-server=127.0.0.1 --channel='#test' --nick-prefix=username --site=https://zulip.example.com --user=irc-bot@example.com --api-key=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx diff --git a/bots/jabber_mirror.py b/bots/jabber_mirror.py index 7146d14..3f609a3 100755 --- a/bots/jabber_mirror.py +++ b/bots/jabber_mirror.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # Copyright (C) 2014 Zulip, Inc. # # Permission is hereby granted, free of charge, to any person diff --git a/bots/jabber_mirror_backend.py b/bots/jabber_mirror_backend.py index b86cbe7..c22f189 100755 --- a/bots/jabber_mirror_backend.py +++ b/bots/jabber_mirror_backend.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2.7 # # Copyright (C) 2013 Permabit, Inc. # Copyright (C) 2013--2014 Zulip, Inc. diff --git a/bots/log2zulip b/bots/log2zulip index 2c3bfac..d8750c8 100755 --- a/bots/log2zulip +++ b/bots/log2zulip @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2.7 import subprocess import os import sys diff --git a/bots/process_ccache b/bots/process_ccache index 091f946..89363b6 100755 --- a/bots/process_ccache +++ b/bots/process_ccache @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2.7 import sys import subprocess import base64 diff --git a/bots/sync-public-streams b/bots/sync-public-streams index a535e76..e890586 100755 --- a/bots/sync-public-streams +++ b/bots/sync-public-streams @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 import sys import os import logging diff --git a/bots/tddium-notify-humbug b/bots/tddium-notify-humbug index 6ab221c..2a97225 100755 --- a/bots/tddium-notify-humbug +++ b/bots/tddium-notify-humbug @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # Copyright (C) 2012 Zulip, Inc. # # Permission is hereby granted, free of charge, to any person diff --git a/bots/zephyr_mirror.py b/bots/zephyr_mirror.py index 356725e..26b56b6 100755 --- a/bots/zephyr_mirror.py +++ b/bots/zephyr_mirror.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # Copyright (C) 2012 Zulip, Inc. # # Permission is hereby granted, free of charge, to any person diff --git a/bots/zephyr_mirror_backend.py b/bots/zephyr_mirror_backend.py index 77148d3..39e33be 100755 --- a/bots/zephyr_mirror_backend.py +++ b/bots/zephyr_mirror_backend.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # Copyright (C) 2012 Zulip, Inc. # # Permission is hereby granted, free of charge, to any person diff --git a/examples/create-user b/examples/create-user index c492fdd..6f2a379 100755 --- a/examples/create-user +++ b/examples/create-user @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2.7 # -*- coding: utf-8 -*- # Copyright © 2012-2014 Zulip, Inc. diff --git a/examples/edit-message b/examples/edit-message index af61fb7..609f291 100755 --- a/examples/edit-message +++ b/examples/edit-message @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # -*- coding: utf-8 -*- # Copyright © 2012 Zulip, Inc. diff --git a/examples/get-public-streams b/examples/get-public-streams index c71c354..2137d13 100755 --- a/examples/get-public-streams +++ b/examples/get-public-streams @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # -*- coding: utf-8 -*- # Copyright © 2012 Zulip, Inc. diff --git a/examples/list-members b/examples/list-members index d7829ae..70c1c1b 100755 --- a/examples/list-members +++ b/examples/list-members @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # -*- coding: utf-8 -*- # Copyright © 2014 Zulip, Inc. diff --git a/examples/list-subscriptions b/examples/list-subscriptions index 67d26b9..6223dab 100755 --- a/examples/list-subscriptions +++ b/examples/list-subscriptions @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # -*- coding: utf-8 -*- # Copyright © 2012 Zulip, Inc. diff --git a/examples/print-events b/examples/print-events index 06c1450..a3d0457 100755 --- a/examples/print-events +++ b/examples/print-events @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # -*- coding: utf-8 -*- # Copyright © 2012 Zulip, Inc. diff --git a/examples/print-messages b/examples/print-messages index eda3503..f1a521e 100755 --- a/examples/print-messages +++ b/examples/print-messages @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # -*- coding: utf-8 -*- # Copyright © 2012 Zulip, Inc. diff --git a/examples/print-next-message b/examples/print-next-message index 901a19a..cf41e32 100755 --- a/examples/print-next-message +++ b/examples/print-next-message @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # -*- coding: utf-8 -*- # Copyright © 2012 Zulip, Inc. diff --git a/examples/send-message b/examples/send-message index 582ae6b..f257e57 100755 --- a/examples/send-message +++ b/examples/send-message @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # -*- coding: utf-8 -*- # Copyright © 2012 Zulip, Inc. diff --git a/examples/subscribe b/examples/subscribe index 6e94d36..548a02e 100755 --- a/examples/subscribe +++ b/examples/subscribe @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # -*- coding: utf-8 -*- # Copyright © 2012 Zulip, Inc. diff --git a/examples/unsubscribe b/examples/unsubscribe index 4e9d69a..3b72173 100755 --- a/examples/unsubscribe +++ b/examples/unsubscribe @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # -*- coding: utf-8 -*- # Copyright © 2012 Zulip, Inc. diff --git a/integrations/asana/zulip_asana_config.py b/integrations/asana/zulip_asana_config.py index 6020f6d..c14db0b 100644 --- a/integrations/asana/zulip_asana_config.py +++ b/integrations/asana/zulip_asana_config.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # -*- coding: utf-8 -*- # # Copyright © 2014 Zulip, Inc. diff --git a/integrations/asana/zulip_asana_mirror b/integrations/asana/zulip_asana_mirror index c0ee4d8..1fbb0be 100755 --- a/integrations/asana/zulip_asana_mirror +++ b/integrations/asana/zulip_asana_mirror @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # -*- coding: utf-8 -*- # # Asana integration for Zulip diff --git a/integrations/basecamp/zulip_basecamp_config.py b/integrations/basecamp/zulip_basecamp_config.py index c343a69..024ace0 100644 --- a/integrations/basecamp/zulip_basecamp_config.py +++ b/integrations/basecamp/zulip_basecamp_config.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # -*- coding: utf-8 -*- # # Copyright © 2014 Zulip, Inc. diff --git a/integrations/basecamp/zulip_basecamp_mirror b/integrations/basecamp/zulip_basecamp_mirror index f56fccf..abacb31 100755 --- a/integrations/basecamp/zulip_basecamp_mirror +++ b/integrations/basecamp/zulip_basecamp_mirror @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # -*- coding: utf-8 -*- # # Zulip mirror of Basecamp activity diff --git a/integrations/codebase/zulip_codebase_config.py b/integrations/codebase/zulip_codebase_config.py index d13d80d..fb37981 100644 --- a/integrations/codebase/zulip_codebase_config.py +++ b/integrations/codebase/zulip_codebase_config.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # -*- coding: utf-8 -*- # # Copyright © 2014 Zulip, Inc. diff --git a/integrations/codebase/zulip_codebase_mirror b/integrations/codebase/zulip_codebase_mirror index 6f7d8fc..c3e7863 100755 --- a/integrations/codebase/zulip_codebase_mirror +++ b/integrations/codebase/zulip_codebase_mirror @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # -*- coding: utf-8 -*- # # Zulip mirror of Codebase HQ activity diff --git a/integrations/git/post-receive b/integrations/git/post-receive index df8b97f..eaeb1e5 100755 --- a/integrations/git/post-receive +++ b/integrations/git/post-receive @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # -*- coding: utf-8 -*- # # Zulip notification post-receive hook. diff --git a/integrations/git/zulip_git_config.py b/integrations/git/zulip_git_config.py index 9b3157a..b0be000 100644 --- a/integrations/git/zulip_git_config.py +++ b/integrations/git/zulip_git_config.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # -*- coding: utf-8 -*- # # Copyright © 2014 Zulip, Inc. diff --git a/integrations/hg/zulip-changegroup.py b/integrations/hg/zulip-changegroup.py index f1ec24d..427702c 100755 --- a/integrations/hg/zulip-changegroup.py +++ b/integrations/hg/zulip-changegroup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # -*- coding: utf-8 -*- # # Zulip hook for Mercurial changeset pushes. diff --git a/integrations/nagios/nagios-notify-zulip b/integrations/nagios/nagios-notify-zulip index 6145952..8f2dd28 100755 --- a/integrations/nagios/nagios-notify-zulip +++ b/integrations/nagios/nagios-notify-zulip @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 import optparse import zulip diff --git a/integrations/perforce/git_p4.py b/integrations/perforce/git_p4.py index 494b0ef..ffe2fc9 100644 --- a/integrations/perforce/git_p4.py +++ b/integrations/perforce/git_p4.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # # git-p4.py -- A tool for bidirectional operation between a Perforce depot and git. # diff --git a/integrations/perforce/zulip_change-commit.py b/integrations/perforce/zulip_change-commit.py index 3596267..f1cdee4 100755 --- a/integrations/perforce/zulip_change-commit.py +++ b/integrations/perforce/zulip_change-commit.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # -*- coding: utf-8 -*- # # Copyright © 2012-2014 Zulip, Inc. diff --git a/integrations/perforce/zulip_perforce_config.py b/integrations/perforce/zulip_perforce_config.py index 2928a0c..de36c30 100644 --- a/integrations/perforce/zulip_perforce_config.py +++ b/integrations/perforce/zulip_perforce_config.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # -*- coding: utf-8 -*- # # Copyright © 2014 Zulip, Inc. diff --git a/integrations/rss/rss-bot b/integrations/rss/rss-bot index 0511e2b..9aa7925 100755 --- a/integrations/rss/rss-bot +++ b/integrations/rss/rss-bot @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # -*- coding: utf-8 -*- # # RSS integration for Zulip diff --git a/integrations/svn/post-commit b/integrations/svn/post-commit index dabfb12..7f67e13 100755 --- a/integrations/svn/post-commit +++ b/integrations/svn/post-commit @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # -*- coding: utf-8 -*- # # Zulip notification post-commit hook. diff --git a/integrations/svn/zulip_svn_config.py b/integrations/svn/zulip_svn_config.py index 70a84c9..a69fc04 100644 --- a/integrations/svn/zulip_svn_config.py +++ b/integrations/svn/zulip_svn_config.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # -*- coding: utf-8 -*- # # Copyright © 2014 Zulip, Inc. diff --git a/integrations/twitter/twitter-bot b/integrations/twitter/twitter-bot index 30c890f..ec3ad03 100755 --- a/integrations/twitter/twitter-bot +++ b/integrations/twitter/twitter-bot @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # -*- coding: utf-8 -*- # # Twitter integration for Zulip diff --git a/integrations/twitter/twitter-search-bot b/integrations/twitter/twitter-search-bot index 64e42d8..64938f5 100755 --- a/integrations/twitter/twitter-search-bot +++ b/integrations/twitter/twitter-search-bot @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # -*- coding: utf-8 -*- # # Twitter search integration for Zulip diff --git a/setup.py b/setup.py index e12955d..129303d 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # -*- coding: utf-8 -*- import os