summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
b09f930)
This should fix convert-ly failure in release 2.11.40.
program_name = os.path.basename (sys.argv[0])
program_version = '@TOPLEVEL_VERSION@'
program_name = os.path.basename (sys.argv[0])
program_version = '@TOPLEVEL_VERSION@'
+error_file_write = ly.stderr_write
+
def warning (s):
ly.stderr_write (program_name + ": " + _ ("warning: %s") % s + '\n')
def warning (s):
ly.stderr_write (program_name + ": " + _ ("warning: %s") % s + '\n')
for x in convertrules.conversions:
if (not from_version or x[0] > from_version) \
and (not to_version or x[0] <= to_version):
for x in convertrules.conversions:
if (not from_version or x[0] > from_version) \
and (not to_version or x[0] <= to_version):
- file.write ('%s: %s\n' % (tup_to_str (x[0]), x[2]))
+ ly.encoded_write (file, '%s: %s\n' % (tup_to_str (x[0]), x[2]))
def do_conversion (str, from_version, to_version):
"""Apply conversions from FROM_VERSION to TO_VERSION. Return
def do_conversion (str, from_version, to_version):
"""Apply conversions from FROM_VERSION to TO_VERSION. Return
string."""
conv_list = get_conversions (from_version, to_version)
string."""
conv_list = get_conversions (from_version, to_version)
- if convertrules.error_file:
- convertrules.error_file.write (_ ("Applying conversion: "))
+ error_file_write (_ ("Applying conversion: "))
last_conversion = ()
try:
for x in conv_list:
last_conversion = ()
try:
for x in conv_list:
- convertrules.error_file.write (tup_to_str (x[0]))
+ error_file_write (tup_to_str (x[0]))
- convertrules.error_file.write (', ')
+ error_file_write (', ')
str = x[1] (str)
last_conversion = x[0]
except convertrules.FatalConversionError:
str = x[1] (str)
last_conversion = x[0]
except convertrules.FatalConversionError:
- convertrules.error_file.write ('\n'
- + _ ("Error while converting")
- + '\n'
- + _ ("Stopping at last succesful rule")
- + '\n')
+ error_file_write ('\n'
+ + _ ("Error while converting")
+ + '\n'
+ + _ ("Stopping at last succesful rule")
+ + '\n')
return (last_conversion, str)
return (last_conversion, str)
elif not global_options.skip_version_add:
result = newversion + '\n' + result
elif not global_options.skip_version_add:
result = newversion + '\n' + result
- convertrules.error_file.write ('\n')
+ error_file_write ('\n')
if global_options.edit:
try:
if global_options.edit:
try: