mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-27 11:52:25 +00:00
dee5eec15f
This commit fixes the following warning:
DeprecationWarning: 'U' mode is deprecated
Removing 'U' has no effect with Python 3 [1]:
There is an additional mode character permitted, 'U', which no
longer has any effect, and is considered deprecated. It previously
enabled universal newlines in text mode, which became the default
behaviour in Python 3.0.
[1] https://docs.python.org/3/library/functions.html?highlight=open#open
(cherry picked from commit 9715d3504c
)
52 lines
1.2 KiB
Python
52 lines
1.2 KiB
Python
#! /usr/bin/env python
|
|
|
|
from __future__ import print_function
|
|
|
|
import sys
|
|
from getopt import getopt
|
|
|
|
usage = '''
|
|
python cat.py -o OUTFILE FILE1 FILE2 .... FILEn
|
|
|
|
Replacement for:
|
|
cat FILE1 FILE2 ... .FILEn > OUTFILE
|
|
If the -o argument is not given, writes to stdout.
|
|
'''
|
|
|
|
outfile = ""
|
|
|
|
(options, args) = getopt(sys.argv[1:], "ho:")
|
|
for (opt, param) in options:
|
|
if opt == "-o":
|
|
outfile = param
|
|
elif opt == "-h":
|
|
print(usage)
|
|
sys.exit(0)
|
|
|
|
out = sys.stdout
|
|
if outfile:
|
|
# always write unix line endings, even on windows
|
|
out = open(outfile, "wb")
|
|
|
|
for f in args:
|
|
if sys.version_info[0] < 3:
|
|
# accept both windows and unix line endings, since it can
|
|
# happen that we are on unix, but the file has been written on
|
|
# windows or vice versa.
|
|
mode = "rU"
|
|
else:
|
|
# The default behavior of Python 3 is to enable universal
|
|
# newlines in text mode. Adding "U" gives a deprecation
|
|
# warning.
|
|
mode = "r"
|
|
fil = open(f, mode)
|
|
for l in fil:
|
|
# this does always write unix line endings since the file has
|
|
# been opened in binary mode. This is needed since both gettext
|
|
# and our .pot file manipulation scripts assume unix line ends.
|
|
out.write(l)
|
|
fil.close()
|
|
|
|
if outfile:
|
|
out.close()
|