Consistently use /usr/bin/env python2.7 in shebangs and commands.

analytics/management/commands/analyze_user_activity.py

@@ -42,7 +42,7 @@ It will correctly not count server-initiated reloads in the activity statistics.
 
 The duration flag can be used to control how many days to show usage duration for
 
-Usage: python manage.py analyze_user_activity [--realm=zulip.com] [--date=2013-09-10] [--duration=1]
+Usage: python2.7 manage.py analyze_user_activity [--realm=zulip.com] [--date=2013-09-10] [--duration=1]
 
 By default, if no date is selected 2013-09-10 is used. If no realm is provided, information
 is shown for all realms"""

analytics/management/commands/client_activity.py

@@ -13,9 +13,9 @@ class Command(BaseCommand):
 
 Usage examples:
 
-python manage.py client_activity
+python2.7 manage.py client_activity
-python manage.py client_activity zulip.com
+python2.7 manage.py client_activity zulip.com
-python manage.py client_activity jesstess@zulip.com"""
+python2.7 manage.py client_activity jesstess@zulip.com"""
 
     def add_arguments(self, parser):
         parser.add_argument('arg', metavar='<arg>', type=str, nargs='?', default=None,

api/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.
 

api/examples/create-user

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2.7
 # -*- coding: utf-8 -*-
 
 # Copyright © 2012-2014 Zulip, Inc.

api/examples/edit-message

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # -*- coding: utf-8 -*-
 
 # Copyright © 2012 Zulip, Inc.

api/examples/get-public-streams

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # -*- coding: utf-8 -*-
 
 # Copyright © 2012 Zulip, Inc.

api/examples/list-members

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # -*- coding: utf-8 -*-
 
 # Copyright © 2014 Zulip, Inc.

api/examples/list-subscriptions

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # -*- coding: utf-8 -*-
 
 # Copyright © 2012 Zulip, Inc.

api/examples/print-events

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # -*- coding: utf-8 -*-
 
 # Copyright © 2012 Zulip, Inc.

api/examples/print-messages

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # -*- coding: utf-8 -*-
 
 # Copyright © 2012 Zulip, Inc.

api/examples/print-next-message

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # -*- coding: utf-8 -*-
 
 # Copyright © 2012 Zulip, Inc.

api/examples/send-message

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # -*- coding: utf-8 -*-
 
 # Copyright © 2012 Zulip, Inc.

api/examples/subscribe

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # -*- coding: utf-8 -*-
 
 # Copyright © 2012 Zulip, Inc.

api/examples/unsubscribe

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # -*- coding: utf-8 -*-
 
 # Copyright © 2012 Zulip, Inc.

api/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.

api/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

api/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.

api/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

api/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.

api/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

api/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.

api/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.

api/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.

api/integrations/nagios/nagios-notify-zulip

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 import optparse
 import zulip
 

api/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.
 #

api/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.

api/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.

api/integrations/rss/rss-bot

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # -*- coding: utf-8 -*-
 #
 # RSS integration for Zulip

api/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.

api/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.

api/integrations/twitter/twitter-bot

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # -*- coding: utf-8 -*-
 #
 # Twitter integration for Zulip

api/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

api/setup.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # -*- coding: utf-8 -*-
 
 import os

assets/favicon/generate

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 import xml.etree.ElementTree as ET
 import subprocess
 

bin/get-django-setting

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 from __future__ import absolute_import
 
 import os

bin/log-management-command

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 import sys
 import logging
 import os

bots/check-mirroring

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 import sys
 import time
 import optparse

bots/check-rabbitmq-consumers

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 
 import sys
 import time

bots/check-rabbitmq-queue

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 
 import sys
 import re

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):

bots/gcal-bot

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 import sys
 import time
 import datetime

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=<CHANNEL> --nick-prefix=<NICK> [optional args]
+usage = """python2.7 irc-mirror.py --server=IRC_SERVER --channel=<CHANNEL> --nick-prefix=<NICK> [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
 

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

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.

bots/log2zulip

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2.7
 import subprocess
 import os
 import sys

bots/process_ccache

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2.7
 import sys
 import subprocess
 import base64

bots/sync-public-streams

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 import sys
 import os
 import logging

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

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

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

docs/code-style.rst

@@ -352,8 +352,8 @@ styles (separate lines for each selector)::
 Python
 ------
 
--  Scripts should start with ``#!/usr/bin/env python`` and not
+-  Scripts should start with ``#!/usr/bin/env python2.7`` and not
-   ``#!/usr/bin/python``. See commit ``437d4aee`` for an explanation of
+   ``#!/usr/bin/env python2.7``. See commit ``437d4aee`` for an explanation of
    why. Don't put such a line on a Python file unless it's meaningful to
    run it as a script. (Some libraries can also be run as scripts, e.g.
    to run a test suite.)

docs/html_unescape.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python2.7
 
 # Remove HTML entity escaping left over from MediaWiki->rST conversion.
 

manage.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 import os
 import sys
 import logging

puppet/zulip/files/nagios_plugins/check_queue_worker_errors

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 
 """
 Nagios plugin to check that none of our queue workers have reported errors.

puppet/zulip/files/postgresql/process_fts_updates

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 import psycopg2
 import psycopg2.extensions
 import select

puppet/zulip/files/supervisor/conf.d/zulip.conf

@@ -8,7 +8,7 @@
 ; variables can be expanded using this syntax: "%(ENV_HOME)s".
 
 [fcgi-program:zulip-django]
-command=python /home/zulip/deployments/current/manage.py runfcgi daemonize=False maxchildren=20 ; the program (relative uses PATH, can take args)
+command=python2.7 /home/zulip/deployments/current/manage.py runfcgi daemonize=False maxchildren=20 ; the program (relative uses PATH, can take args)
 ;process_name=%(program_name)s ; process_name expr (default %(program_name)s)
 ;numprocs=1                    ; number of processes copies to start (def 1)
 ;directory=/tmp                ; directory to cwd to before exec (def no cwd)
@@ -43,7 +43,7 @@ socket_owner=zulip:zulip
 socket_mode=0700
 
 [program:zulip-tornado]
-command=python /home/zulip/deployments/current/manage.py runtornado localhost:9993
+command=python2.7 /home/zulip/deployments/current/manage.py runtornado localhost:9993
 priority=200                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -57,7 +57,7 @@ stdout_logfile_backups=10     ; # of stdout logfile backups (default 10)
 directory=/home/zulip/deployments/current/
 
 [program:zulip-events-user-activity]
-command=python /home/zulip/deployments/current/manage.py process_queue user_activity
+command=python2.7 /home/zulip/deployments/current/manage.py process_queue user_activity
 priority=300                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -71,7 +71,7 @@ stdout_logfile_backups=10     ; # of stdout logfile backups (default 10)
 directory=/home/zulip/deployments/current/
 
 [program:zulip-events-user-activity-interval]
-command=python /home/zulip/deployments/current/manage.py process_queue user_activity_interval
+command=python2.7 /home/zulip/deployments/current/manage.py process_queue user_activity_interval
 priority=300                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -85,7 +85,7 @@ stdout_logfile_backups=10     ; # of stdout logfile backups (default 10)
 directory=/home/zulip/deployments/current/
 
 [program:zulip-events-user-presence]
-command=python /home/zulip/deployments/current/manage.py process_queue user_presence
+command=python2.7 /home/zulip/deployments/current/manage.py process_queue user_presence
 priority=300                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -99,7 +99,7 @@ stdout_logfile_backups=10     ; # of stdout logfile backups (default 10)
 directory=/home/zulip/deployments/current/
 
 [program:zulip-events-signups]
-command=python /home/zulip/deployments/current/manage.py process_queue signups
+command=python2.7 /home/zulip/deployments/current/manage.py process_queue signups
 priority=400                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -113,7 +113,7 @@ stdout_logfile_backups=10     ; # of stdout logfile backups (default 10)
 directory=/home/zulip/deployments/current/
 
 [program:zulip-events-confirmation-emails]
-command=python /home/zulip/deployments/current/manage.py process_queue invites
+command=python2.7 /home/zulip/deployments/current/manage.py process_queue invites
 priority=500                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -127,7 +127,7 @@ stdout_logfile_backups=10     ; # of stdout logfile backups (default 10)
 directory=/home/zulip/deployments/current/
 
 [program:zulip-events-missedmessage_reminders]
-command=python /home/zulip/deployments/current/manage.py process_queue missedmessage_emails
+command=python2.7 /home/zulip/deployments/current/manage.py process_queue missedmessage_emails
 priority=600                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -141,7 +141,7 @@ stdout_logfile_backups=10     ; # of stdout logfile backups (default 10)
 directory=/home/zulip/deployments/current/
 
 [program:zulip-events-missedmessage_mobile_notifications]
-command=python /home/zulip/deployments/current/manage.py process_queue missedmessage_mobile_notifications
+command=python2.7 /home/zulip/deployments/current/manage.py process_queue missedmessage_mobile_notifications
 priority=600                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -155,7 +155,7 @@ stdout_logfile_backups=10     ; # of stdout logfile backups (default 10)
 directory=/home/zulip/deployments/current/
 
 [program:zulip-events-slowqueries]
-command=python /home/zulip/deployments/current/manage.py process_queue slow_queries
+command=python2.7 /home/zulip/deployments/current/manage.py process_queue slow_queries
 priority=600                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -169,7 +169,7 @@ stdout_logfile_backups=10     ; # of stdout logfile backups (default 10)
 directory=/home/zulip/deployments/current/
 
 [program:zulip-events-message_sender]
-command=python /home/zulip/deployments/current/manage.py process_queue message_sender %(process_num)s
+command=python2.7 /home/zulip/deployments/current/manage.py process_queue message_sender %(process_num)s
 process_name=%(program_name)s-%(process_num)s
 priority=350                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
@@ -185,7 +185,7 @@ directory=/home/zulip/deployments/current/
 numprocs=5
 
 [program:zulip-events-feedback_messages]
-command=python /home/zulip/deployments/current/manage.py process_queue feedback_messages
+command=python2.7 /home/zulip/deployments/current/manage.py process_queue feedback_messages
 priority=600                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -199,7 +199,7 @@ stdout_logfile_backups=10     ; # of stdout logfile backups (default 10)
 directory=/home/zulip/deployments/current/
 
 [program:zulip-events-error_reports]
-command=python /home/zulip/deployments/current/manage.py process_queue error_reports
+command=python2.7 /home/zulip/deployments/current/manage.py process_queue error_reports
 priority=600                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -213,7 +213,7 @@ stdout_logfile_backups=10     ; # of stdout logfile backups (default 10)
 directory=/home/zulip/deployments/current/
 
 [program:zulip-events-digest_emails]
-command=python /home/zulip/deployments/current/manage.py process_queue digest_emails
+command=python2.7 /home/zulip/deployments/current/manage.py process_queue digest_emails
 priority=600                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -227,7 +227,7 @@ stdout_logfile_backups=10     ; # of stdout logfile backups (default 10)
 directory=/home/zulip/deployments/current/
 
 [program:zulip-events-email_mirror]
-command=python /home/zulip/deployments/current/manage.py process_queue email_mirror
+command=python2.7 /home/zulip/deployments/current/manage.py process_queue email_mirror
 priority=600                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -241,7 +241,7 @@ stdout_logfile_backups=10     ; # of stdout logfile backups (default 10)
 directory=/home/zulip/deployments/current/
 
 [program:zulip-deliver-enqueued-emails]
-command=python /home/zulip/deployments/current/manage.py deliver_email
+command=python2.7 /home/zulip/deployments/current/manage.py deliver_email
 priority=600                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)

puppet/zulip_internal/files/apache/sites/graphite

@@ -32,7 +32,7 @@ Listen 444
         SetHandler None
     </Location>
 
-    Alias /media/ "/usr/lib/pymodules/python2.7/django/contrib/admin/media/"
+    Alias /media/ "/usr/lib/pymodules/python2/django/contrib/admin/media/"
     <Location "/media/">
             SetHandler None
     </Location>

puppet/zulip_internal/files/cron.d/active-user-stats

@@ -1,3 +1,3 @@
 MAILTO=root
 
-*/10 * * * *   zulip cd /home/zulip/deployments/current && python manage.py active_user_stats
+*/10 * * * *   zulip cd /home/zulip/deployments/current && python2.7 manage.py active_user_stats

puppet/zulip_internal/files/cron.d/check-apns-tokens

@@ -1,4 +1,4 @@
 MAILTO=root
 
 # Remove any stale apple device tokens from our list
-0 3 * * * zulip cd /home/zulip/deployments/current && python manage.py check_apns_tokens
+0 3 * * * zulip cd /home/zulip/deployments/current && python2.7 manage.py check_apns_tokens

puppet/zulip_internal/files/cron.d/clearsessions

@@ -1,4 +1,4 @@
 MAILTO=root
 
 # Clear all expired Django sessions at 10:22 PM every day.
-22 22 * * *   zulip cd /home/zulip/deployments/current && python manage.py clearsessions
+22 22 * * *   zulip cd /home/zulip/deployments/current && python2.7 manage.py clearsessions

puppet/zulip_internal/files/cron.d/send-digest-emails

@@ -1,4 +1,4 @@
 MAILTO=root
 
 # Send digest emails once a day. Time is in UTC.
-0 18 * * *   zulip cd /home/zulip/deployments/current && python manage.py enqueue_digest_emails
+0 18 * * *   zulip cd /home/zulip/deployments/current && python2.7 manage.py enqueue_digest_emails

puppet/zulip_internal/files/nagios_plugins/check_fts_update_log

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2.7
 
 """
 Nagios plugin to check the length of the FTS update log.

puppet/zulip_internal/files/nagios_plugins/check_personal_zephyr_mirrors

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 
 """
 Nagios plugin to check that Zephyr personals mirrors are forwarding.

puppet/zulip_internal/files/nagios_plugins/check_pg_replication_lag

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2.7
 
 """
 Nagios plugin to check the difference between the primary and

puppet/zulip_internal/files/nagios_plugins/check_postgres_backup

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2.7
 
 import dateutil.parser
 import pytz

puppet/zulip_internal/files/nagios_plugins/check_rabbitmq_consumers

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 
 """
 Nagios plugin to check that the rabbitmq has the correct number of consumers

puppet/zulip_internal/files/nagios_plugins/check_rabbitmq_queues

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 
 """
 Nagios plugin to check that the rabbitmq queues are not overflowing as a result

puppet/zulip_internal/files/nagios_plugins/check_send_receive_time

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 
 """
 Script to provide information about send-receive times.

puppet/zulip_internal/files/nagios_plugins/check_user_zephyr_mirror_liveness

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 
 """
 Nagios plugin to check that our MIT users' Zephyr mirrors are running.

puppet/zulip_internal/files/nagios_plugins/check_zephyr_mirror

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 
 """
 Nagios plugin to check that Zephyr mirror forwarding is running.

puppet/zulip_internal/files/postgresql/pg_backup_and_purge.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2.7
 
 import subprocess
 import sys

puppet/zulip_internal/files/supervisor/conf.d/stats.conf

@@ -3,7 +3,7 @@
 
 
 [program:zulip-carbon-cache]
-command=python /opt/graphite/bin/carbon-cache.py --debug start
+command=python2.7 /opt/graphite/bin/carbon-cache.py --debug start
 priority=200                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -15,7 +15,7 @@ stdout_logfile=/var/log/zulip/carbon-cache.log         ; stdout log path, NONE f
 directory=/home/zulip/
 
 [program:zulip-carbon-aggregator]
-command=python /opt/graphite/bin/carbon-aggregator.py --debug start
+command=python2.7 /opt/graphite/bin/carbon-aggregator.py --debug start
 priority=200                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)

puppet/zulip_internal/files/trac/cgi-bin/trac.cgi

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2.7
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2003-2009 Edgewall Software

puppet/zulip_internal/files/trac/cgi-bin/trac.fcgi

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2.7
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2003-2009 Edgewall Software

puppet/zulip_internal/files/trac/cgi-bin/trac.wsgi

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2.7
 # -*- coding: utf-8 -*-
 #
 # Copyright (C)2008-2009 Edgewall Software

puppet/zulip_internal/files/zulip-ec2-configure-interfaces

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2.7
 # -*- coding: utf-8 -*-
 #
 # Copyright © 2013 Zulip, Inc.

scripts/lib/unpack-zulip

@@ -1,4 +1,4 @@
-#!/usr/bin/python -u
+#!/usr/bin/env python2.7 -u
 import os
 import sys
 import subprocess

scripts/lib/upgrade-zulip

@@ -1,4 +1,4 @@
-#!/usr/bin/python -u
+#!/usr/bin/env python2.7 -u
 import os
 import sys
 import subprocess

scripts/lib/upgrade-zulip-stage-2

@@ -1,4 +1,4 @@
-#!/usr/bin/python -u
+#!/usr/bin/env python2.7 -u
 import subprocess
 import os
 import sys

scripts/purge-old-deployments

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2.7
 import sys
 import os
 import logging

scripts/restart-server

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 import os
 import sys
 import pwd
@@ -20,10 +20,10 @@ if pwd.getpwuid(os.getuid())[0] != "zulip":
     sys.exit(1)
 
 # Send a statsd event on restarting the server
-subprocess.check_call(["python", "./manage.py", "send_stats", "incr", "events.server_restart", str(int(time.time()))])
+subprocess.check_call(["python2.7", "./manage.py", "send_stats", "incr", "events.server_restart", str(int(time.time()))])
 
 logging.info("Filling memcached caches")
-subprocess.check_call(["python", "./manage.py", "fill_memcached_caches"])
+subprocess.check_call(["python2.7", "./manage.py", "fill_memcached_caches"])
 
 # Restart the FastCGI and related processes via supervisorctl.
 logging.info("Stopping workers")

scripts/setup/generate_secrets.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # This tools generates local_settings_generated.py using the template
 
 import sys, os, os.path

scripts/setup/initialize-database

@@ -3,12 +3,12 @@
 # Change to root directory of the checkout that we're running from
 cd "$(dirname "$0")/../.."
 
-python manage.py checkconfig
+python2.7 manage.py checkconfig
 
-python manage.py migrate --noinput
+python2.7 manage.py migrate --noinput
-python manage.py createcachetable third_party_api_results
+python2.7 manage.py createcachetable third_party_api_results
 
-if ! python manage.py initialize_voyager_db; then
+if ! python2.7 manage.py initialize_voyager_db; then
     set +x
     echo
     echo -e "\033[32mPopulating default database failed."

scripts/zulip-puppet-apply

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2.7
 
 import sys
 import subprocess

templates/zerver/api.html

@@ -65,7 +65,7 @@ to pull out the resulting HTML :)
       </div>
 
       <div class="tab-pane" id="python">
-<div class="codehilite"><pre><span class="c">#!/usr/bin/env python</span>
+<div class="codehilite"><pre><span class="c">#!/usr/bin/env python2.7</span>
 
 <span class="kn">import</span> <span class="nn">zulip</span>
 <span class="kn">import</span> <span class="nn">sys</span>

tools/check-templates

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 import os
 import sys
 import subprocess

tools/compile-handlebars-templates

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 from __future__ import absolute_import
 
 import os

tools/deprecated/finbot/money.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2.7
 import datetime
 import monthdelta
 

tools/deprecated/generate-activity-metrics.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 #
 # Generates % delta activity metrics from graphite/statsd data
 #

tools/deprecated/iframe-bot/show-last-messages

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # -*- coding: utf-8 -*-
 
 # Copyright © 2013 Zulip, Inc.

tools/deprecated/inject-messages/inject-messages

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 #
 # This is tool for injecting messages during a usability study.  It's
 # likely useless for other applications.

tools/deprecated/review

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # encoding: utf-8
 #
 # Copyright (C) 2010 Ksplice, Inc.

tools/emoji_dump/emoji_dump.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 import os
 import shutil
 import subprocess

tools/get-handlebar-vars

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 import sys
 import re
 import json

tools/lint-all

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 import os
 import re
 import sys

tools/minify-js

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 
 # Minifies JavaScripts, creating source maps
 

tools/post-receive

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 #
 # Zulip's post-receive hook.  There is a symlink
 #   from /home/git/repositories/eng/zulip.git/hooks/post-receive

tools/print-all/print-all

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 import sh
 import os
 import re

tools/python-proxy

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # -*- coding: cp1252 -*-
 # <PythonProxy.py>
 #

tools/run-dev-queue-processors

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 
 # This script is only meant to be run from run-dev.py, which sets up the
 # environment correctly and passes the correct arguments for manage.py.  It is a