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

diff --git a/development/cmake/po/cat.py b/development/cmake/po/cat.py
index 0462b29c2f903e37441a28fb3386b16f67728ac5..025f887716c138a2581743a5466cb1e02694c8ef 100644 (file)
--- a/development/cmake/po/cat.py
+++ b/development/cmake/po/cat.py
@@ -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