Python lilylib: remove path insertion of @lilypond_datadir@/python

[lilypond.git] / python / lilylib.py

diff --git a/python/lilylib.py b/python/lilylib.py
index cfa5e67d0a7b0de58428f76b3ea96efac1cecdc1..34174e12666b34afc37e03d777ffd5d17cf83a27 100644 (file)
--- a/python/lilylib.py
+++ b/python/lilylib.py
@@ -11,7 +11,6 @@ import glob
 import os
 import re
 import shutil
-import string
 import sys
 import optparse
 
@@ -35,9 +34,6 @@ if os.environ.has_key ('LILYPOND_DATADIR') :
     while datadir[-1] == os.sep:
        datadir= datadir[:-1]
 
-sys.path.insert (0, os.path.join (datadir, 'python'))
-
-
 # Python 2.5 only accepts strings with proper Python internal encoding
 # (i.e. ASCII or Unicode) when writing to stdout/stderr, so we must
 # use ugettext iso gettext, and encode the string when writing to
@@ -69,6 +65,14 @@ def stderr_write (s):
 
 progress = stderr_write
 
+def require_python_version ():
+    if sys.hexversion < 0x02040000:
+        stderr_write ("Python 2.4 or newer is required to run this program.\n\
+Please upgrade Python from http://python.org/download/, and if you use MacOS X,\n\
+please read 'Setup for MacOS X' in Application Usage.")
+        os.system ("open http://python.org/download/")
+        sys.exit (2)
+
 # Modified version of the commands.mkarg(x), which always uses 
 # double quotes (since Windows can't handle the single quotes:
 def mkarg(x):
@@ -185,7 +189,7 @@ def strip_extension (f, ext):
 
 def search_exe_path (name):
     p = os.environ['PATH']
-    exe_paths = string.split (p, ':')
+    exe_paths = p.split (':')
     for e in exe_paths:
        full = os.path.join (e, name)
        if os.path.exists (full):