From 5ff925d5837f9caacef483c4f6609dc64c79f084 Mon Sep 17 00:00:00 2001 From: TierraDelFuego Date: Sat, 12 Jan 2013 22:53:43 -0800 Subject: [PATCH 1/3] Removing call to python where it is not needed. --- options_std.py | 1 - router.example.py | 1 - routes.example.py | 1 - 3 files changed, 3 deletions(-) diff --git a/options_std.py b/options_std.py index c531e7f3..8e0d3d6e 100644 --- a/options_std.py +++ b/options_std.py @@ -1,4 +1,3 @@ -#!/usr/bin/python # -*- coding: utf-8 -*- # when web2py is run as a windows service (web2py.py -W) diff --git a/router.example.py b/router.example.py index 75e3af9e..714a5a0a 100644 --- a/router.example.py +++ b/router.example.py @@ -1,4 +1,3 @@ -#!/usr/bin/python # -*- coding: utf-8 -*- # routers are dictionaries of URL routing parameters. diff --git a/routes.example.py b/routes.example.py index fdcfebc6..06ac5db2 100644 --- a/routes.example.py +++ b/routes.example.py @@ -1,4 +1,3 @@ -#!/usr/bin/python # -*- coding: utf-8 -*- # default_application, default_controller, default_function From e363ee0994b4464530a36b724f962b78be9b5e0c Mon Sep 17 00:00:00 2001 From: TierraDelFuego Date: Sat, 12 Jan 2013 23:34:35 -0800 Subject: [PATCH 2/3] Change the call to python from /usr/bin/python to /usr/bin/env python so the correct python is called when using virtualenv. Remove the the call if not needed. --- .gitignore | 3 +-- applications/welcome/routes.example.py | 1 - gluon/contrib/pysimplesoap/client.py | 2 +- gluon/contrib/pysimplesoap/server.py | 2 +- gluon/contrib/pysimplesoap/simplexml.py | 2 +- gluon/contrib/pysimplesoap/transport.py | 2 +- gluon/contrib/shell.py | 1 - gluon/contrib/simplejsonrpc.py | 1 - gluon/contrib/websocket_messaging.py | 2 +- scripts/autoroutes.py | 1 - scripts/extract_sqlite_models.py | 1 - 11 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 39a6f517..dcbca4c0 100644 --- a/.gitignore +++ b/.gitignore @@ -52,5 +52,4 @@ applications/*/*.py[oc] applications/examples/static/epydoc applications/examples/static/sphinx applications/admin/cron/cron.master - - +./HOWTO-web2py-devel diff --git a/applications/welcome/routes.example.py b/applications/welcome/routes.example.py index 5194cb8e..1f3b78cf 100644 --- a/applications/welcome/routes.example.py +++ b/applications/welcome/routes.example.py @@ -1,4 +1,3 @@ -#!/usr/bin/python # -*- coding: utf-8 -*- # This is an app-specific example router diff --git a/gluon/contrib/pysimplesoap/client.py b/gluon/contrib/pysimplesoap/client.py index 4b05d3a8..75bca191 100755 --- a/gluon/contrib/pysimplesoap/client.py +++ b/gluon/contrib/pysimplesoap/client.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: latin-1 -*- # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by the diff --git a/gluon/contrib/pysimplesoap/server.py b/gluon/contrib/pysimplesoap/server.py index 12c618c4..3888b49c 100755 --- a/gluon/contrib/pysimplesoap/server.py +++ b/gluon/contrib/pysimplesoap/server.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: latin-1 -*- # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by the diff --git a/gluon/contrib/pysimplesoap/simplexml.py b/gluon/contrib/pysimplesoap/simplexml.py index 6b0cea5f..2a57c902 100755 --- a/gluon/contrib/pysimplesoap/simplexml.py +++ b/gluon/contrib/pysimplesoap/simplexml.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: latin-1 -*- # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by the diff --git a/gluon/contrib/pysimplesoap/transport.py b/gluon/contrib/pysimplesoap/transport.py index a1491334..5441e342 100644 --- a/gluon/contrib/pysimplesoap/transport.py +++ b/gluon/contrib/pysimplesoap/transport.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: latin-1 -*- # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by the diff --git a/gluon/contrib/shell.py b/gluon/contrib/shell.py index d6dedf50..e875a57a 100755 --- a/gluon/contrib/shell.py +++ b/gluon/contrib/shell.py @@ -1,4 +1,3 @@ -#!/usr/bin/python # # Copyright 2007 Google Inc. # diff --git a/gluon/contrib/simplejsonrpc.py b/gluon/contrib/simplejsonrpc.py index 5143cea7..afdaec7d 100644 --- a/gluon/contrib/simplejsonrpc.py +++ b/gluon/contrib/simplejsonrpc.py @@ -1,4 +1,3 @@ -#!/usr/bin/python # -*- coding: utf-8 -*- # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by the diff --git a/gluon/contrib/websocket_messaging.py b/gluon/contrib/websocket_messaging.py index dae2feb3..dcd4a35e 100644 --- a/gluon/contrib/websocket_messaging.py +++ b/gluon/contrib/websocket_messaging.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python """ This file is part of the web2py Web Framework Copyrighted by Massimo Di Pierro diff --git a/scripts/autoroutes.py b/scripts/autoroutes.py index aaef82dd..cc68b490 100644 --- a/scripts/autoroutes.py +++ b/scripts/autoroutes.py @@ -1,4 +1,3 @@ -#!/usr/bin/python # -*- coding: utf-8 -*- ''' autoroutes writes routes for you based on a simpler routing diff --git a/scripts/extract_sqlite_models.py b/scripts/extract_sqlite_models.py index 3f7ad2a1..b9638ede 100644 --- a/scripts/extract_sqlite_models.py +++ b/scripts/extract_sqlite_models.py @@ -1,4 +1,3 @@ -#!/usr/bin/python # -*- coding: utf-8 -*- ''' From 9b9b79ed588ff6891ec98157a5d3bde0fbba6e79 Mon Sep 17 00:00:00 2001 From: TierraDelFuego Date: Sat, 12 Jan 2013 23:41:28 -0800 Subject: [PATCH 3/3] Add a file to ignore. --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index dcbca4c0..6525ee59 100644 --- a/.gitignore +++ b/.gitignore @@ -52,4 +52,4 @@ applications/*/*.py[oc] applications/examples/static/epydoc applications/examples/static/sphinx applications/admin/cron/cron.master -./HOWTO-web2py-devel +HOWTO-web2py-devel