mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-21 17:51:03 +00:00
cat.py: fix Python deprecation warning
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
This commit is contained in:
parent
f8e40f8ab8
commit
9715d3504c
@ -29,9 +29,17 @@ if outfile:
|
||||
out = open(outfile, "wb")
|
||||
|
||||
for f in args:
|
||||
# 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.
|
||||
fil = open(f, "rU")
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user