make executable bit and shebang consistent on various source files

setup.py is intended to be run with "python setup.py install"

sources in the tornado module which have main functions/clauses
are intended to be run with "python -m tornado.xxx"

various demos and scripts can be run directly

diff --git a/demos/appengine/blog.py b/demos/appengine/blog.py
index 5ac4061d6c187338bfc11384eb5f94b5ea3572cf..e2b2ef50423c38ce6f79e10892c342230e267d7a 100644 (file)
--- a/demos/appengine/blog.py
+++ b/demos/appengine/blog.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2009 Facebook
 #

diff --git a/demos/benchmark/gen_benchmark.py b/demos/benchmark/gen_benchmark.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/demos/file_upload/file_receiver.py b/demos/file_upload/file_receiver.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/demos/s3server/s3server.py b/demos/s3server/s3server.py
index f3051a1d3d1b7362776296588babb457eb6d7fef..c01f06c4694833f34df593076c5084010eadb2b3 100644 (file)
--- a/demos/s3server/s3server.py
+++ b/demos/s3server/s3server.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2009 Facebook
 #

diff --git a/demos/tcpecho/client.py b/demos/tcpecho/client.py
old mode 100644 (file)
new mode 100755 (executable)
index a369fa4..51d3a8d
--- a/demos/tcpecho/client.py
+++ b/demos/tcpecho/client.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 from __future__ import print_function
 from tornado.ioloop import IOLoop
 from tornado import gen

diff --git a/demos/tcpecho/server.py b/demos/tcpecho/server.py
old mode 100644 (file)
new mode 100755 (executable)
index bc0b054..ebe683c
--- a/demos/tcpecho/server.py
+++ b/demos/tcpecho/server.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 import logging
 from tornado.ioloop import IOLoop
 from tornado import gen

diff --git a/demos/twitter/twitterdemo.py b/demos/twitter/twitterdemo.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/demos/webspider/webspider.py b/demos/webspider/webspider.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/maint/circlerefs/circlerefs.py b/maint/circlerefs/circlerefs.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/maint/scripts/test_resolvers.py b/maint/scripts/test_resolvers.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/maint/test/appengine/common/cgi_runtests.py b/maint/test/appengine/common/cgi_runtests.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/maint/test/appengine/common/runtests.py b/maint/test/appengine/common/runtests.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/maint/test/redbot/red_test.py b/maint/test/redbot/red_test.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/maint/test/websocket/client.py b/maint/test/websocket/client.py
index d1b1aaf56a4b519dabc1141cc94ea6effb3455fa..03aed18162eabf622ac3c53d3ca1a873bd1118a3 100644 (file)
--- a/maint/test/websocket/client.py
+++ b/maint/test/websocket/client.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import logging
 
 from tornado import gen

diff --git a/maint/test/websocket/server.py b/maint/test/websocket/server.py
index c237afc78963cf68ef3fa060a6ca1f6081b5c2ab..2b71adda253ca5c31242f34b9d1bf0971a501ab3 100644 (file)
--- a/maint/test/websocket/server.py
+++ b/maint/test/websocket/server.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 from tornado.ioloop import IOLoop
 from tornado.options import define, options, parse_command_line
 from tornado.websocket import WebSocketHandler

diff --git a/maint/vm/windows/bootstrap.py b/maint/vm/windows/bootstrap.py
old mode 100644 (file)
new mode 100755 (executable)
index e9f4f7d..281bf57
--- a/maint/vm/windows/bootstrap.py
+++ b/maint/vm/windows/bootstrap.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 r"""Installs files needed for tornado testing on windows.
 
 These instructions are compatible with the VMs provided by http://modern.ie.

diff --git a/setup.py b/setup.py
index 7cea09991f1c84a759aeefac84db11400021f55f..6da90103f17e68136121e1c3fdfd9afaa31b6435 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2009 Facebook
 #

diff --git a/tornado/__init__.py b/tornado/__init__.py
index c55e9cb0527ce1ff8af302bfe36fc36627fe5cdf..3bd16d99e54f8f94a8b604edf3bede25be1b3e6e 100644 (file)
--- a/tornado/__init__.py
+++ b/tornado/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2009 Facebook
 #

diff --git a/tornado/_locale_data.py b/tornado/_locale_data.py
index 6fa2c29742af692196e9edd5ad953ef95acc462b..a2c503907d4324f00acbe0afead1436189533d44 100644 (file)
--- a/tornado/_locale_data.py
+++ b/tornado/_locale_data.py
@@ -1,5 +1,4 @@
-#!/usr/bin/env python
-# coding: utf-8
+# -*- coding: utf-8 -*-
 #
 # Copyright 2012 Facebook
 #

diff --git a/tornado/auth.py b/tornado/auth.py
index b8d373a581e88acf3da057ebc52cdb50474c99a1..8462548fec60c9082d92a46e1e741fcb193c2282 100644 (file)
--- a/tornado/auth.py
+++ b/tornado/auth.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2009 Facebook
 #

diff --git a/tornado/autoreload.py b/tornado/autoreload.py
index 64204455e925e7ba8d910b8bad524a62d2d586f5..2f91127031480b734bac3a03164911606af7ce8d 100644 (file)
--- a/tornado/autoreload.py
+++ b/tornado/autoreload.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2009 Facebook
 #

diff --git a/tornado/concurrent.py b/tornado/concurrent.py
index dd0d46593e20f2f84db6e1924113899176f83cc6..cca6468c4110bf20804a47c8b18fc87290614fd7 100644 (file)
--- a/tornado/concurrent.py
+++ b/tornado/concurrent.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2012 Facebook
 #

diff --git a/tornado/curl_httpclient.py b/tornado/curl_httpclient.py
index e0ec3fbaf88be76a29c15f3c7e6e9c8aa806af62..1523fdcba67b34febb2b5b2ca1b8208919786fc4 100644 (file)
--- a/tornado/curl_httpclient.py
+++ b/tornado/curl_httpclient.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2009 Facebook
 #

diff --git a/tornado/escape.py b/tornado/escape.py
index 7fa6853bb3ef5bc08dfdfdea0e23837a20459331..f9699634e475a5578575381fea62fa13c615893b 100644 (file)
--- a/tornado/escape.py
+++ b/tornado/escape.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2009 Facebook
 #

diff --git a/tornado/http1connection.py b/tornado/http1connection.py
index 4d20593a5a1b0757ddfc46019678b0f335512c0f..ed906223a3f6788820e65f0516dcf81c18b0588c 100644 (file)
--- a/tornado/http1connection.py
+++ b/tornado/http1connection.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2014 Facebook
 #

diff --git a/tornado/httpserver.py b/tornado/httpserver.py
index da755f846f04cda570898419a7997392542d2e89..3498d71fb6c08814a2536027021b5853c4348fe7 100644 (file)
--- a/tornado/httpserver.py
+++ b/tornado/httpserver.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2009 Facebook
 #

diff --git a/tornado/httputil.py b/tornado/httputil.py
old mode 100755 (executable)
new mode 100644 (file)
index 1799de5..ceff735
--- a/tornado/httputil.py
+++ b/tornado/httputil.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2009 Facebook
 #

diff --git a/tornado/ioloop.py b/tornado/ioloop.py
index b28eb46fe82c070607e41514c8816933c06cea4a..138a61b5c2984d68432f03c71d8709dd0918c8ca 100644 (file)
--- a/tornado/ioloop.py
+++ b/tornado/ioloop.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2009 Facebook
 #

diff --git a/tornado/iostream.py b/tornado/iostream.py
index fb89da089d0098e6ca626b8645d23b26fa1b6683..d77460320545c4f692d8f850010f8ea6284a9111 100644 (file)
--- a/tornado/iostream.py
+++ b/tornado/iostream.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2009 Facebook
 #

diff --git a/tornado/locale.py b/tornado/locale.py
index 7dba10d616c3a3440b1b14b77290536b99a41fa7..d45172f3b879ebb0b2e9ed3bf8d09b74f3a2c98a 100644 (file)
--- a/tornado/locale.py
+++ b/tornado/locale.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
+#
 # Copyright 2009 Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may

diff --git a/tornado/log.py b/tornado/log.py
index fc95a5f98b19150e07dc4bda77fe45f162dc76ab..3074b637157d70f050a27a4757337a3b1dfcf967 100644 (file)
--- a/tornado/log.py
+++ b/tornado/log.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2012 Facebook
 #

diff --git a/tornado/netutil.py b/tornado/netutil.py
index 5f52e2dea4a8a53a521761442e7460bd974747ff..2d55ccf19c21bf09b7677909dca66b570f75c7b0 100644 (file)
--- a/tornado/netutil.py
+++ b/tornado/netutil.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2011 Facebook
 #

diff --git a/tornado/options.py b/tornado/options.py
index 9635f7580dd51c510d9a0c508aa9fc0dc8e63635..a6f77029f75030c260a9dda8d9e575a7a804f0b9 100644 (file)
--- a/tornado/options.py
+++ b/tornado/options.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2009 Facebook
 #

diff --git a/tornado/platform/auto.py b/tornado/platform/auto.py
index 1f4d7001939cc8b227a5c8c5cbf877eaac622d24..1a9133faf34eeb281d707a734debe203323a1df8 100644 (file)
--- a/tornado/platform/auto.py
+++ b/tornado/platform/auto.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2011 Facebook
 #

diff --git a/tornado/platform/epoll.py b/tornado/platform/epoll.py
index 80bfd8af4c69a51425f8c34d1c24f0893c30796a..4e34617406e99de1edf7be21270bcd48fd60319c 100644 (file)
--- a/tornado/platform/epoll.py
+++ b/tornado/platform/epoll.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2012 Facebook
 #

diff --git a/tornado/platform/interface.py b/tornado/platform/interface.py
index c0ef2905c3d30ab604e8e3f62153d1f3d035edb2..cac532646551c84d6a2ae6acbe65c89153c63e96 100644 (file)
--- a/tornado/platform/interface.py
+++ b/tornado/platform/interface.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2011 Facebook
 #

diff --git a/tornado/platform/kqueue.py b/tornado/platform/kqueue.py
index 3a5d417429d3b958860ae0c1d6616804b7b0efe0..4e0aee02eeaf6966c90e0cda9c8dedc74b80c6ad 100644 (file)
--- a/tornado/platform/kqueue.py
+++ b/tornado/platform/kqueue.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2012 Facebook
 #

diff --git a/tornado/platform/posix.py b/tornado/platform/posix.py
index 9bf1f18868ca70f8016cc4f6667d71aa961d5bc2..6fe1fa8372241a3e14feb2ed0c453ee605d09376 100644 (file)
--- a/tornado/platform/posix.py
+++ b/tornado/platform/posix.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2011 Facebook
 #

diff --git a/tornado/platform/select.py b/tornado/platform/select.py
index a18049f7cdab0a56bbc327ce67c52bf13bd637fe..14e8a4745c53e858668f009e2814fdd1eef7d3a2 100644 (file)
--- a/tornado/platform/select.py
+++ b/tornado/platform/select.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2012 Facebook
 #

diff --git a/tornado/process.py b/tornado/process.py
index 6da398497d9156af9126308a621001dd3719e3b2..fcf66225978e62b3e5eae365069399a08b414175 100644 (file)
--- a/tornado/process.py
+++ b/tornado/process.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2011 Facebook
 #

diff --git a/tornado/simple_httpclient.py b/tornado/simple_httpclient.py
index 6d90352f1a80673a3ced0cd1159fb6b0cc0cd251..3c192fcd4ad7681dc0acd43bdf4c5b70fa9a868d 100644 (file)
--- a/tornado/simple_httpclient.py
+++ b/tornado/simple_httpclient.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 from __future__ import absolute_import, division, print_function
 
 from tornado.escape import utf8, _unicode

diff --git a/tornado/stack_context.py b/tornado/stack_context.py
index 61ae51f4eb10641d2bcb43afeacc11cd316e3321..2f26f3845f1c09383a841d0def1c5e9c3212d9f9 100644 (file)
--- a/tornado/stack_context.py
+++ b/tornado/stack_context.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2010 Facebook
 #

diff --git a/tornado/tcpclient.py b/tornado/tcpclient.py
index 5496439852b15da7fed67b88859a5c92c2fd939b..3a1b58ca8601a6bef37b2975878e855378fd50ea 100644 (file)
--- a/tornado/tcpclient.py
+++ b/tornado/tcpclient.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2014 Facebook
 #

diff --git a/tornado/tcpserver.py b/tornado/tcpserver.py
index 53cd26af409c45c7c904c48d85d1692cdb36603b..1adc489560dcf1b5400cf8289e54d82eb357453e 100644 (file)
--- a/tornado/tcpserver.py
+++ b/tornado/tcpserver.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2011 Facebook
 #

diff --git a/tornado/template.py b/tornado/template.py
index 0818178dca7820b645bb77ebf699cded70765fe5..61b987462cc7c1799234671704f56abd9c52027f 100644 (file)
--- a/tornado/template.py
+++ b/tornado/template.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2009 Facebook
 #

diff --git a/tornado/test/concurrent_test.py b/tornado/test/concurrent_test.py
index bbefb1c6175c7da087617543f575e10d42b8e30d..3c7d435fc8a5a43a9a9b5249d1e2f1e955fec5d6 100644 (file)
--- a/tornado/test/concurrent_test.py
+++ b/tornado/test/concurrent_test.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2012 Facebook
 #

diff --git a/tornado/test/escape_test.py b/tornado/test/escape_test.py
index 70aa4bdd6ac80693f801fc49bf3a2d04c22f44f7..f2f2902a0ad439684f3a0ec087321c40d6ed944f 100644 (file)
--- a/tornado/test/escape_test.py
+++ b/tornado/test/escape_test.py
@@ -1,9 +1,6 @@
-#!/usr/bin/env python
-
-
 from __future__ import absolute_import, division, print_function
-import tornado.escape
 
+import tornado.escape
 from tornado.escape import (
     utf8, xhtml_escape, xhtml_unescape, url_escape, url_unescape,
     to_unicode, json_decode, json_encode, squeeze, recursive_unicode,

diff --git a/tornado/test/httpclient_test.py b/tornado/test/httpclient_test.py
index 140bc3101b78ef901883922563fab6e6cbb603be..f04b9b12cabb421b2ca0ddc861d0d1ec7f649f2e 100644 (file)
--- a/tornado/test/httpclient_test.py
+++ b/tornado/test/httpclient_test.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 from __future__ import absolute_import, division, print_function
 
 import base64

diff --git a/tornado/test/httpserver_test.py b/tornado/test/httpserver_test.py
index aa9d831d712d7087fb037ffb6ab5fcb3f3cc3ee2..825fa642ff1a8aaadbc9768524d842a60d65daab 100644 (file)
--- a/tornado/test/httpserver_test.py
+++ b/tornado/test/httpserver_test.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-
-
 from __future__ import absolute_import, division, print_function
 
 from tornado import netutil

diff --git a/tornado/test/httputil_test.py b/tornado/test/httputil_test.py
index 8abb07a93cc2b1347b81287f422ad3372befc9cb..5c064ddea42b49449612cf2a1bea5729b6e52702 100644 (file)
--- a/tornado/test/httputil_test.py
+++ b/tornado/test/httputil_test.py
@@ -1,7 +1,4 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-
-
 from __future__ import absolute_import, division, print_function
 
 from tornado.httputil import (

diff --git a/tornado/test/ioloop_test.py b/tornado/test/ioloop_test.py
index d5cbebd008ecdbdae274bf74ebe7b36b1040ef62..b761a3f54a0918bd60a149b84a3b9c031e38cad6 100644 (file)
--- a/tornado/test/ioloop_test.py
+++ b/tornado/test/ioloop_test.py
@@ -1,7 +1,5 @@
-#!/usr/bin/env python
-
-
 from __future__ import absolute_import, division, print_function
+
 import contextlib
 import datetime
 import functools

diff --git a/tornado/test/log_test.py b/tornado/test/log_test.py
index 0565d5668598c1bd7641efb3b7c6dd4d3f11cc52..48519c3c3c9577cffcfd4cb73b2477dba016f938 100644 (file)
--- a/tornado/test/log_test.py
+++ b/tornado/test/log_test.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2012 Facebook
 #

diff --git a/tornado/test/process_test.py b/tornado/test/process_test.py
index 8497a7d8f37e1662d9f3441d6e72d7c1cf14e766..c9694f03ffa7673f57fec7f5a79b09a86a3965b1 100644 (file)
--- a/tornado/test/process_test.py
+++ b/tornado/test/process_test.py
@@ -1,12 +1,11 @@
-#!/usr/bin/env python
-
-
 from __future__ import absolute_import, division, print_function
+
 import logging
 import os
 import signal
 import subprocess
 import sys
+
 from tornado.httpclient import HTTPClient, HTTPError
 from tornado.httpserver import HTTPServer
 from tornado.ioloop import IOLoop

diff --git a/tornado/test/runtests.py b/tornado/test/runtests.py
index 9699f5133c489fc6868ce326bda8bed0cfd7956f..1dcc5eec77b92e0a2a873cc626a04089e58083a7 100644 (file)
--- a/tornado/test/runtests.py
+++ b/tornado/test/runtests.py
@@ -1,12 +1,12 @@
-#!/usr/bin/env python
-
 from __future__ import absolute_import, division, print_function
+
 import gc
 import locale  # system locale module, not tornado.locale
 import logging
 import operator
 import textwrap
 import sys
+
 from tornado.httpclient import AsyncHTTPClient
 from tornado.httpserver import HTTPServer
 from tornado.ioloop import IOLoop

diff --git a/tornado/test/stack_context_test.py b/tornado/test/stack_context_test.py
index fb9e0d7ac48b1842702f5fc584627efd12829534..098f0f0f0cd6fa071cfc00830cbb61a1ef68c82e 100644 (file)
--- a/tornado/test/stack_context_test.py
+++ b/tornado/test/stack_context_test.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 from __future__ import absolute_import, division, print_function
 
 from tornado import gen

diff --git a/tornado/test/tcpclient_test.py b/tornado/test/tcpclient_test.py
index faaaf96e78e19c6a95e0164a0171af8bc4bb2b32..ca42cf47ea71c7c797633b97eb92a94d92d944c4 100644 (file)
--- a/tornado/test/tcpclient_test.py
+++ b/tornado/test/tcpclient_test.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2014 Facebook
 #

diff --git a/tornado/test/testing_test.py b/tornado/test/testing_test.py
index 21ae7833d577da8bae63b26a48ca096c33e99352..049bc8bbd7b154cb1d595e457321ae30f122f24d 100644 (file)
--- a/tornado/test/testing_test.py
+++ b/tornado/test/testing_test.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 from __future__ import absolute_import, division, print_function
 
 from tornado import gen, ioloop

diff --git a/tornado/testing.py b/tornado/testing.py
index 21d4d88752ee6352fb0232aedb0fb2691ccec1e9..5d6d6197dba47341695a738e4dec9f0907329a54 100644 (file)
--- a/tornado/testing.py
+++ b/tornado/testing.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """Support classes for automated testing.
 
 * `AsyncTestCase` and `AsyncHTTPTestCase`:  Subclasses of unittest.TestCase

diff --git a/tornado/web.py b/tornado/web.py
index 91d9abd1c7cea75019d8c298894a7ce96a89ac3e..5fa3abd8b5e6d5d2fbd4dcdf3d98723309fca1be 100644 (file)
--- a/tornado/web.py
+++ b/tornado/web.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2009 Facebook
 #

diff --git a/tornado/wsgi.py b/tornado/wsgi.py
index 68a7615a0ef930a83d47f6a0bc024cd4ee36ed91..22be7a897235080ac5805bb9cf638ab4a7d9af77 100644 (file)
--- a/tornado/wsgi.py
+++ b/tornado/wsgi.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2009 Facebook
 #