[gettext] Update to 0.19.1-2
Daiki Ueno
ueno at fedoraproject.org
Mon Jul 7 02:48:20 UTC 2014
commit 5a1ae756c6425b3d48ffc6ab75ad2b05464e6f06
Author: Daiki Ueno <dueno at redhat.com>
Date: Mon Jul 7 11:48:26 2014 +0900
Update to 0.19.1-2
gettext-no-strict-header-check.patch | 89 ----------------------------------
gettext.spec | 6 ++-
msghack.py | 81 +++++++++++++++----------------
3 files changed, 45 insertions(+), 131 deletions(-)
---
diff --git a/gettext.spec b/gettext.spec
index 333e86c..6741d5f 100644
--- a/gettext.spec
+++ b/gettext.spec
@@ -6,7 +6,7 @@
Summary: GNU libraries and utilities for producing multi-lingual messages
Name: gettext
Version: 0.19.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv3+ and LGPLv2+
Group: Development/Tools
URL: http://www.gnu.org/software/gettext/
@@ -329,6 +329,10 @@ fi
%{_emacs_sitelispdir}/%{name}/*.el
%changelog
+* Mon Jul 7 2014 Daiki Ueno <dueno at redhat.com> - 0.19.1-2
+- apply patch to msghack.py, for Python 3 compatibility (Closes: #1113425,
+ thanks to Bohuslav "Slavek" Kabrda)
+
* Tue Jun 10 2014 Daiki Ueno <dueno at redhat.com> - 0.19.1-1
- update to 0.19.1 release
- switch to xz-compressed archive
diff --git a/msghack.py b/msghack.py
index 0e16104..29bc1a8 100755
--- a/msghack.py
+++ b/msghack.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
## -*- coding: utf-8 -*-
## Copyright (C) 2001, 2004, 2008, 2012 Red Hat, Inc.
## Copyright (C) 2001 Trond Eivind Glomsrød <teg at redhat.com>
@@ -20,7 +20,6 @@
A msghack replacement
"""
-import string
import sys
class GTMessage:
@@ -35,8 +34,8 @@ class GTMessage:
@message The message
@id The messageid associated with the object
"""
- self._message=string.strip(message)
- self._id=string.strip(id)
+ self._message=message.strip()
+ self._id=id.strip()
self._refs=[]
for ref in refs:
self._refs.append(ref)
@@ -178,7 +177,7 @@ class GTFile:
msgar.append(GTMessage(message._id,message._message,message._refs))
continue
msg=GTMessage(message._message,message._id,message._refs)
- if not msght.has_key(msg._id):
+ if msg._id not in msght:
msght[msg._id]=msg
msgar.append(msg)
else:
@@ -199,7 +198,7 @@ class GTFile:
res=""
for message in self._messages:
msgid=message._id
- if msgids.has_key(msgid):
+ if msgid in msgids:
res=res+"Duplicate: %s\n" % (msgid)
else:
msgids[msgid]=1
@@ -259,12 +258,12 @@ class GTFile:
inmsgstr=0
templines=file.readlines()
for line in templines:
- lines.append(string.strip(line))
+ lines.append(line.strip())
for line in lines:
- pos=string.find(line,'"')
- pos2=string.rfind(line,'"')
+ pos=line.find('"')
+ pos2=line.rfind('"')
if line and line[0]=="#":
- refs.append(string.strip(line))
+ refs.append(line.strip())
if inmsgstr==0 and line[:6]=="msgstr":
msgstr=""
inmsgstr=1
@@ -342,7 +341,7 @@ class GTMaster:
def printUsage():
"Print the usage messages"
- print "Usage: ", str(sys.argv[0])," [OPTION] file.po [ref.po]\n\
+ print("Usage: ", str(sys.argv[0])," [OPTION] file.po [ref.po]\n\
This program can be used to alter .po files in ways no sane mind would think about.\n\
-o result will be written to FILE\n\
--invert invert a po file by switching msgid and msgstr\n\
@@ -350,26 +349,26 @@ This program can be used to alter .po files in ways no sane mind would think abo
--empty empty the contents of the .po file, creating a .pot\n\
--append append entries from ref.po that don't exist in file.po\n\
\n\
-Note: It is just a replacement of msghack for backward support.\n"
+Note: It is just a replacement of msghack for backward support.\n")
if __name__=="__main__":
output=None
res=None
if("-o") in sys.argv:
- if (len(sys.argv)<=sys.argv.index("-o")+1):
- print "file.po and ref.po are not specified!\n"
- printUsage()
- exit(1)
- output=sys.argv[sys.argv.index("-o")+1]
+ if (len(sys.argv)<=sys.argv.index("-o")+1):
+ print("file.po and ref.po are not specified!\n")
+ printUsage()
+ exit(1)
+ output=sys.argv[sys.argv.index("-o")+1]
sys.argv.remove("-o")
- sys.argv.remove(output)
+ sys.argv.remove(output)
if("--invert") in sys.argv:
- if (len(sys.argv)<=sys.argv.index("--invert")+1):
- print "file.po is not specified!\n"
- printUsage()
- exit(1)
- file=sys.argv[sys.argv.index("--invert")+1]
+ if (len(sys.argv)<=sys.argv.index("--invert")+1):
+ print("file.po is not specified!\n")
+ printUsage()
+ exit(1)
+ file=sys.argv[sys.argv.index("--invert")+1]
gtf=GTFile(file)
res1=gtf.msgidDupes()
if res1:
@@ -377,41 +376,41 @@ if __name__=="__main__":
sys.exit(1)
res=str(gtf.invertedStrings())
elif("--empty") in sys.argv:
- if (len(sys.argv)<=sys.argv.index("--empty")+1):
- print "file.po is not specified!\n"
- printUsage()
- exit(1)
- file=sys.argv[sys.argv.index("--empty")+1]
+ if (len(sys.argv)<=sys.argv.index("--empty")+1):
+ print("file.po is not specified!\n")
+ printUsage()
+ exit(1)
+ file=sys.argv[sys.argv.index("--empty")+1]
gtf=GTFile(file)
res=str(gtf.emptyMsgStrings())
elif("--master") in sys.argv:
- if (len(sys.argv)<=sys.argv.index("--master")+1):
- print "file.po is not specified!\n"
- printUsage()
- exit(1)
- loc=sys.argv.index("--master")+1
+ if (len(sys.argv)<=sys.argv.index("--master")+1):
+ print("file.po is not specified!\n")
+ printUsage()
+ exit(1)
+ loc=sys.argv.index("--master")+1
gtfs=[]
for file in sys.argv[loc:]:
gtfs.append(GTFile(file))
master=GTMaster(gtfs)
res=str(master)
elif("--append") in sys.argv:
- if (len(sys.argv)<=sys.argv.index("--append")+2):
- print "file.po and/or ref.po are not specified!\n"
- printUsage()
- exit(1)
- file=sys.argv[sys.argv.index("--append")+1]
+ if (len(sys.argv)<=sys.argv.index("--append")+2):
+ print("file.po and/or ref.po are not specified!\n")
+ printUsage()
+ exit(1)
+ file=sys.argv[sys.argv.index("--append")+1]
file2=sys.argv[sys.argv.index("--append")+2]
gtf=GTFile(file)
gtf2=GTFile(file2)
gtf.append(gtf2)
res=str(gtf)
else:
- #print "Not implemented: "+str(sys.argv)
- printUsage()
+ #print("Not implemented: "+str(sys.argv))
+ printUsage()
sys.exit(1)
if not output:
- print res
+ print(res)
else:
file=open(output,"w")
file.write(res)
More information about the scm-commits
mailing list