mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-09-19 22:40:26 +00:00
Python fixes for export to LyX Archive
Patch by Kees and José Matos. For discussion, please see this [1] ML thread. José additionally notes [2] the following: I took the change and I changed some minor annoyances: * test comparison with None; * fixed a region where the indentation was different from all the others (2 spaces instead of 4); * replaced xrange with range. [1] https://www.mail-archive.com/search?l=mid&q=007b01da285a%241b8e28c0%2452aa7a40%24%40gmail.com [2] https://www.mail-archive.com/search?l=mid&q=0cd9fe5fd161c0ad8950258867255a3bfae8dbc1.camel%40gmail.com
This commit is contained in:
parent
4723f8e754
commit
9143878e5d
@ -233,7 +233,7 @@ def find_lyx2lyx(progloc, path):
|
|||||||
if "PATHEXT" in os.environ:
|
if "PATHEXT" in os.environ:
|
||||||
extlist = extlist + os.environ["PATHEXT"].split(os.pathsep)
|
extlist = extlist + os.environ["PATHEXT"].split(os.pathsep)
|
||||||
lyx_exe, full_path = find_exe(["lyxc", "lyx"], extlist, path)
|
lyx_exe, full_path = find_exe(["lyxc", "lyx"], extlist, path)
|
||||||
if lyx_exe == None:
|
if lyx_exe is None:
|
||||||
error('Cannot find the LyX executable in the path.')
|
error('Cannot find the LyX executable in the path.')
|
||||||
try:
|
try:
|
||||||
cmd_stdout = subprocess.check_output([lyx_exe, '-version'], stderr=subprocess.STDOUT)
|
cmd_stdout = subprocess.check_output([lyx_exe, '-version'], stderr=subprocess.STDOUT)
|
||||||
@ -265,9 +265,9 @@ def main(args):
|
|||||||
ourprog = args[0]
|
ourprog = args[0]
|
||||||
|
|
||||||
try:
|
try:
|
||||||
(options, argv) = getopt(args[1:], "htzl:o:")
|
(options, argv) = getopt(args[1:], "htzl:o:")
|
||||||
except:
|
except:
|
||||||
error(usage(ourprog))
|
error(usage(ourprog))
|
||||||
|
|
||||||
# we expect the filename to be left
|
# we expect the filename to be left
|
||||||
if len(argv) != 1:
|
if len(argv) != 1:
|
||||||
@ -278,19 +278,19 @@ def main(args):
|
|||||||
lyx2lyx = None
|
lyx2lyx = None
|
||||||
|
|
||||||
for (opt, param) in options:
|
for (opt, param) in options:
|
||||||
if opt == "-h":
|
if opt == "-h":
|
||||||
print(usage(ourprog))
|
print(usage(ourprog))
|
||||||
sys.exit(0)
|
sys.exit(0)
|
||||||
elif opt == "-t":
|
elif opt == "-t":
|
||||||
makezip = False
|
makezip = False
|
||||||
elif opt == "-z":
|
elif opt == "-z":
|
||||||
makezip = True
|
makezip = True
|
||||||
elif opt == "-l":
|
elif opt == "-l":
|
||||||
lyx2lyx = param
|
lyx2lyx = param
|
||||||
elif opt == "-o":
|
elif opt == "-o":
|
||||||
outdir = param
|
outdir = param
|
||||||
if not os.path.isdir(unicode(outdir, 'utf-8')):
|
if not os.path.isdir(unicode(outdir, 'utf-8')):
|
||||||
error('Error: "%s" is not a directory.' % outdir)
|
error('Error: "%s" is not a directory.' % outdir)
|
||||||
|
|
||||||
lyxfile = argv[0]
|
lyxfile = argv[0]
|
||||||
if not running_on_windows:
|
if not running_on_windows:
|
||||||
@ -320,7 +320,7 @@ def main(args):
|
|||||||
|
|
||||||
path = os.environ["PATH"].split(os.pathsep)
|
path = os.environ["PATH"].split(os.pathsep)
|
||||||
|
|
||||||
if lyx2lyx == None:
|
if lyx2lyx is None:
|
||||||
lyx2lyx = find_lyx2lyx(ourprog, path)
|
lyx2lyx = find_lyx2lyx(ourprog, path)
|
||||||
|
|
||||||
# Initialize the list with the specified LyX file and recursively
|
# Initialize the list with the specified LyX file and recursively
|
||||||
@ -390,7 +390,7 @@ if __name__ == "__main__":
|
|||||||
argc = c_int(0)
|
argc = c_int(0)
|
||||||
argv_unicode = CommandLineToArgvW(GetCommandLineW(), byref(argc))
|
argv_unicode = CommandLineToArgvW(GetCommandLineW(), byref(argc))
|
||||||
# unicode_argv[0] is the Python interpreter, so skip that.
|
# unicode_argv[0] is the Python interpreter, so skip that.
|
||||||
argv = [argv_unicode[i].encode('utf-8') for i in xrange(1, argc.value)]
|
argv = [argv_unicode[i].encode('utf-8') for i in range(1, argc.value)]
|
||||||
# Also skip option arguments to the Python interpreter.
|
# Also skip option arguments to the Python interpreter.
|
||||||
while len(argv) > 0:
|
while len(argv) > 0:
|
||||||
if not argv[0].startswith("-"):
|
if not argv[0].startswith("-"):
|
||||||
|
Loading…
Reference in New Issue
Block a user