From b75e9d10bb64ae5d0206680275aaa9c7637abfc3 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 17 May 2006 17:19:02 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 5 +++++ python/convertrules.py | 4 ++-- python/lilylib.py | 21 +++++++-------------- python/midi.c | 2 +- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index badcb47513..4eb16e083c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,11 @@ 2006-05-17 Han-Wen Nienhuys + * python/lilylib.py (system): move import subprocess to system() + definition. Backportme. + + * python/convertrules.py (conv): fix convert-ly rules for 2.9.4 + * VERSION (PATCH_LEVEL): release 2.9.5 * Documentation/topdocs/INSTALL.texi (Top): update versions and diff --git a/python/convertrules.py b/python/convertrules.py index 40e6bfba4e..3bc19ef5f8 100644 --- a/python/convertrules.py +++ b/python/convertrules.py @@ -2784,8 +2784,8 @@ conversions.append (((2, 7, 40), conv, def conv (str): - str = re.sub ('page-penalty', 'page-break-penalty') - str = re.sub ('([^-])penalty', '\1break-penalty') + str = re.sub ('page-penalty', 'page-break-penalty', str) + str = re.sub ('([^-])penalty', '\1break-penalty', str) return str conversions.append (((2, 9, 4), conv, """(page-)penalty -> (page-)break-penalty""")) diff --git a/python/lilylib.py b/python/lilylib.py index 10bddbb6f7..7b43bcb241 100644 --- a/python/lilylib.py +++ b/python/lilylib.py @@ -3,7 +3,7 @@ # # source file of the GNU LilyPond music typesetter # -# (c) 1998--2006 Han-Wen Nienhuys +# (c) 1998--2006 Han-Wen Nienhuys # Jan Nieuwenhuizen import __main__ @@ -14,14 +14,6 @@ import shutil import string import sys import optparse -import subprocess - -## windows mingw cross compile doesn't have selectmodule.so -have_fcntl = True -try: - import fcntl -except ImportError: - have_fcntl = False ################################################################ # Users of python modules should include this snippet @@ -68,10 +60,12 @@ def command_name (cmd): return os.path.basename (cmd) def system (cmd, - ignore_error=False, - progress_p=True, - be_verbose=False, - log_file=None): + ignore_error=False, + progress_p=True, + be_verbose=False, + log_file=None): + + import subprocess show_progress= progress_p name = command_name (cmd) @@ -141,7 +135,6 @@ def print_environment (): for (k,v) in os.environ.items (): sys.stderr.write ("%s=\"%s\"\n" % (k, v)) - class NonDentedHeadingFormatter (optparse.IndentedHelpFormatter): def format_heading(self, heading): if heading: diff --git a/python/midi.c b/python/midi.c index 23d67eb3b7..b5e2f5bf57 100644 --- a/python/midi.c +++ b/python/midi.c @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2001--2006 Han-Wen Nienhuys + (c) 2001--2006 Han-Wen Nienhuys Jan Nieuwenhuizen */ -- 2.39.5