1. Use the standard Python invocation #! line to get the interpreter

   from $PATH

2. Do no direct sys.path munging in this file.  Import the `paths'
   module, which is created during the configure process, and which
   performs all necessary path munging (and exports some useful
   variables too).

3. Remove RCS crud

2 files changed, 6 insertions, 9 deletions

diff --git a/cgi/roster b/cgi/roster
index 54f3510f7..6272e4268 100755
--- a/cgi/roster
+++ b/cgi/roster
@@ -1,4 +1,5 @@
-#!/usr/local/bin/python
+#! /usr/bin/env python
+#
 # Copyright (C) 1998 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
@@ -19,16 +20,14 @@
 
 Takes listname in PATH_INFO."""
 
-__version__ = "$Revision: 547 $"
 
 # We don't need to lock in this script, because we're never going to change
 # data. 
 
 import sys
-sys.path.append('/home/mailman/mailman/modules')
-
 import os, string
 import cgi
+import paths                                      # path hacking
 import mm_utils, maillist, htmlformat, mm_cfg, mm_err
 
 try:
diff --git a/cgi/subscribe b/cgi/subscribe
index d8dee86cc..6a6a050b9 100755
--- a/cgi/subscribe
+++ b/cgi/subscribe
@@ -1,4 +1,5 @@
-#!/usr/local/bin/python
+#! /usr/bin/env python
+#
 # Copyright (C) 1998 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
@@ -17,13 +18,10 @@
 
 """Process listinfo form submission, ie subscriptions or roster requests."""
 
-__version__ = "$Revision: 547 $"
-
 import sys
-sys.path.append('/home/mailman/mailman/modules')
-
 import os, cgi, string
 from regsub import gsub
+import paths                                      # path hacking
 import mm_utils, maillist, mm_err, mm_message, mm_cfg, htmlformat
 
 try: