resync lyx2lyx with 1.4

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@10649 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2005-12-07 15:40:34 +00:00
parent 92cc993ed1
commit 8f92ea6c31
2 changed files with 23 additions and 17 deletions

View File

@ -1,3 +1,7 @@
2005-12-07 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* lyx2lyx: sync with 1.4
2005-11-28 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* lyx2lyx: sync with 1.4

View File

@ -94,14 +94,7 @@ class LyX_Base:
error: the name of the error file, if empty use the standard error.
debug: debug level, O means no debug, as its value increases be more verbose.
"""
if input and input != '-':
self.input = self.open(input)
else:
self.input = sys.stdin
if output:
self.output = open(output, "w")
else:
self.output = sys.stdout
self.choose_io(input, output)
if error:
self.err = open(error, "w")
@ -212,16 +205,25 @@ class LyX_Base:
self.output.write(line+"\n")
def open(self, file):
"""Transparently deals with compressed files."""
def choose_io(self, input, output):
"""Choose input and output streams, dealing transparently with
compressed files."""
self.dir = os.path.dirname(os.path.abspath(file))
try:
gzip.open(file).readline()
self.output = gzip.GzipFile("","wb",6,self.output)
return gzip.open(file)
except:
return open(file)
if output:
self.output = open(output, "wb")
else:
self.output = sys.stdout
if input and input != '-':
self.dir = os.path.dirname(os.path.abspath(input))
try:
gzip.open(input).readline()
self.input = gzip.open(input)
self.output = gzip.GzipFile(mode="wb", fileobj=self.output)
except:
self.input = open(input)
else:
self.input = sys.stdin
def lyxformat(self, format):