Fix warnings in python 2.3.

Add redirection of log as an option.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8209 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/lyx2lyx/ChangeLog b/lib/lyx2lyx/ChangeLog
index 11af38359fc67cbb7077e8e1e97f036bd6ee7832..01b422c25aec9dfb4c62c7d7d398ed66b28097de 100644 (file)
--- a/lib/lyx2lyx/ChangeLog
+++ b/lib/lyx2lyx/ChangeLog
@@ -1,3 +1,10 @@
+2003-12-05  José Matos  <jamatos@lyx.org>
+
+       * error.py:
+       * parser_tools.py: quiet encoding warning in python 2.3.
+
+       * lyx2lyx: add logfile as an option.
+
 2003-12-03  José Matos  <jamatos@lyx.org>
 
        * lyx2lyx: update copyright date

diff --git a/lib/lyx2lyx/error.py b/lib/lyx2lyx/error.py
index 5f3c3fce81b9257e0dc22b5e08e074a59418a033..79eec9fa3ab27ab02a9f449eb1bc51ba508d2bb6 100644 (file)
--- a/lib/lyx2lyx/error.py
+++ b/lib/lyx2lyx/error.py
@@ -1,5 +1,6 @@
 # This file is part of lyx2lyx
-# Copyright (C) 2002 José Matos <jamatos@lyx.org>
+# -*- coding: iso-8859-1 -*-
+# Copyright (C) 2002-2003 José Matos <jamatos@lyx.org>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

diff --git a/lib/lyx2lyx/lyx2lyx b/lib/lyx2lyx/lyx2lyx
index 82af2cac039a9566dfdcdcb83e4b4380feb38bc6..449c1eda65f2cfde8f91d82e8cbdb8ae85b4417a 100755 (executable)
--- a/lib/lyx2lyx/lyx2lyx
+++ b/lib/lyx2lyx/lyx2lyx
@@ -33,6 +33,7 @@ opt = struct()
 
 opt.output = sys.stdout
 opt.input = sys.stdin
+opt.err = sys.stderr
 opt.start = None
 opt.end = None
 opt.quiet = 0
@@ -52,6 +53,7 @@ Options:
     -l, --list                 list all available formats
     -d, --debug level          level=0..2 (O_ no debug information,2_verbose)
                                default: level=1
+    -e, --err error_file       name of the error file or else goes to stderr
     -f, --from version         initial version (optional)
     -t, --to version           final version (optional)
     -o, --output name          name of the output file or else goes to stdout
@@ -59,9 +61,9 @@ Options:
 
 
 def parse_options(argv):
-    _options =  ["help", "version", "list", "debug=", "from=", "to=", "output=", "quiet"]
+    _options =  ["help", "version", "list", "debug=", "err=", "from=", "to=", "output=", "quiet"]
     try:
-       opts, args = getopt.getopt(argv[1:], "d:f:hlo:qt:v", _options)
+       opts, args = getopt.getopt(argv[1:], "d:e:f:hlo:qt:v", _options)
     except getopt.error:
         usage()
         sys.exit(2)
@@ -87,6 +89,8 @@ def parse_options(argv):
             opt.start = lyxformat(a)
         if o in ("-t", "--to"):
             opt.end = lyxformat(a)
+        if o in ("-e","--err"):
+            opt.err = open(a, "w")
 
     if not opt.end:
         opt.end = lst_ft[len(lst_ft)-1]
@@ -105,13 +109,13 @@ def lyxformat(fmt):
     if result:
         fmt = int(result.group(1) + result.group(2))
     else:
-        sys.stderr.write(str(fmt) + ": " + error.invalid_format)
+        opt.err.write(str(fmt) + ": " + error.invalid_format)
         sys.exit(2)
 
     if fmt in lst_ft:
         return fmt
 
-    sys.stderr.write(fmt + ": " + error.format_not_supported)
+    opt.err.write(fmt + ": " + error.format_not_supported)
     sys.exit(1)
 
 def read_file(file, header, body):
@@ -122,7 +126,7 @@ def read_file(file, header, body):
     while 1:
         line = file.readline()
         if not line:
-            sys.stderr.write(error.invalid_file)
+            opt.err.write(error.invalid_file)
             sys.exit(3)
 
         line = line[:-1]
@@ -149,7 +153,7 @@ def read_file(file, header, body):
         body.append(line[:-1])
 
     if not fmt:
-        sys.stderr.write(error.invalid_file)
+        opt.err.write(error.invalid_file)
         sys.exit(3)
     return fmt
 
@@ -168,7 +172,7 @@ def main(argv):
 
     if opt.start:
         if opt.start != fmt:
-            sys.stderr.write("%s: %s %s\n" % (warning.dont_match, opt.start, fmt))
+            opt.err.write("%s: %s %s\n" % (warning.dont_match, opt.start, fmt))
     else:
         opt.start = fmt
 

diff --git a/lib/lyx2lyx/parser_tools.py b/lib/lyx2lyx/parser_tools.py
index 465e174d3a863dce9645e04948f926a7105bd2a5..4472a6e2d92ab96bfa6f3ada055859f0a67f65b6 100644 (file)
--- a/lib/lyx2lyx/parser_tools.py
+++ b/lib/lyx2lyx/parser_tools.py
@@ -1,5 +1,6 @@
 # This file is part of lyx2lyx
-# Copyright (C) 2002 Dekel Tsur <dekel@lyx.org>, José Matos <jamatos@lyx.org>
+# -*- coding: iso-8859-1 -*-
+# Copyright (C) 2002-2003 Dekel Tsur <dekel@lyx.org>, José Matos <jamatos@lyx.org>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License