Merge lp:~vorlon/apt-ddtp-tools/trunk into lp:apt-ddtp-tools

[Steve Langasek]

[lp:~vorlon/apt-ddtp-tools/trunk]

109. By Steve Langasek on 2023-04-14

Update release codenames to something recent ('lunar' instead of 'lucid'). Point to the option to do a one-time translation import instead of telling people to prod the LP devs.

Unmerged revisions

109. By Steve Langasek on 2023-04-14

Update release codenames to something recent ('lunar' instead of 'lucid'). Point to the option to do a one-time translation import instead of telling people to prod the LP devs.

108. By Steve Langasek on 2023-04-14

update for lunar

107. By Steve Langasek on 2023-04-14

python2->python3

106. By Steve Langasek on 2023-04-14

apt_pkg: bytes not string

105. By Steve Langasek on 2023-04-14

python2->python3

104. By Steve Langasek on 2023-04-14

Spelling

103. By Steve Langasek on 2023-04-13

bytes vs str vs unicode, python2 vs python3

102. By Steve Langasek on 2023-04-13

It *says* it only understands strings and files, but it actually only understands bytes

101. By Steve Langasek on 2023-04-13

python3 whitespace

100. By Steve Langasek on 2023-04-13

More python2->python3

=== modified file 'UbuntuChecklist'
--- UbuntuChecklist	2020-04-16 12:01:22 +0000
+++ UbuntuChecklist	2023-04-14 03:34:28 +0000
@@ -18,30 +18,32 @@
 Most data is imported and exported via bzr now, you need the
 dirs:
 
-ubuntu/bzr-po-exports/bzr-ddtp-ubuntu-lucid that links to
-lp:~ubuntu-core-dev/ddtp-ubuntu/ddtp-lucid for the exported po files
+ubuntu/bzr-po-exports/bzr-ddtp-ubuntu-lunar that points to
+lp:~ubuntu-core-dev/ddtp-ubuntu/ddtp-lunar for the exported po files
 
-ubuntu/bzr-pot-imports/bzr-ddtp-pot-lucid that links to
-lp:~ubuntu-core-dev/ddtp-ubuntu/ddtp-pot-lucid for the pot files that LP
+ubuntu/bzr-pot-imports/bzr-ddtp-pot-lunar that points to
+lp:~ubuntu-core-dev/ddtp-ubuntu/ddtp-pot-lunar for the pot files that LP
 will import from you
 
 
 == Opening a new series (for a new ubuntu release) ==
 
 Go to https://launchpad.net/ddtp-ubuntu/+addseries and add something
-like: "natty", "The translations for Ubuntu 11.04 'natty'".
+like: "lunar", "The translations for Ubuntu 23.04 'lunar'".
 
 Go to
-https://translations.launchpad.net/ddtp-ubuntu/natty/+translations-settings
-and select target branch like "lp:~ubuntu-core-dev/ddtp-ubuntu/ddtp-natty" and
+https://translations.launchpad.net/ddtp-ubuntu/lunar/+translations-settings
+and select target branch like "lp:~ubuntu-core-dev/ddtp-ubuntu/ddtp-lunar" and
 make sure to set the syncronisation settings to import "pot and
 translations".
 
-Upload pot files and wait/prod LP devs to import them.
+Push your branch containing the pot files and then request a one-time 
+translation import at
+https://translations.launchpad.net/ddtp-ubuntu/lunar/+request-bzr-import
 
 == Support for alternative series ==
 
-If a update is needed for a alternative series (like "lucid"),
+If an update is needed for an alternative series (like "kinetic"),
 you need to alter the file "series.sh". Then everything should
 work magically.
 
 
=== modified file 'po2translation.py'
--- po2translation.py	2020-04-16 12:01:22 +0000
+++ po2translation.py	2023-04-14 03:34:28 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
 
 import apt_pkg
 import gettext
@@ -29,13 +29,13 @@
 	have_translation=False
 	try:
 		(short_descr, long_descr_chunks) = parse_descr(descr)
-	except UnicodeDecodeError, e:
+	except UnicodeDecodeError as e:
 		logging.warn("decoding of '%s' failed, ignoring (not utf8?)" % descr)
 		return ""
 
 	# we need it as a unicode type so that twrap later works correctly
 	# FIXME: use ugettext() instead
-	short_descr_trans = utf8_str_to_unicode_type(translation.gettext(short_descr))
+	short_descr_trans = translation.gettext(short_descr)
 	if short_descr_trans is None:
 		logging.debug("Found empty translation chunk for '%s'" % pkg)
 		# we have no translation for this chunk
@@ -50,12 +50,12 @@
 		if chunk == "":
 			chunk_translated = ""
 		else:
-			chunk_translated = utf8_str_to_unicode_type(translation.gettext(chunk))
+			chunk_translated = translation.gettext(chunk)
 			# *sigh* more hacks, the theory is that a test
 			# like if chunk.count("\n") > 1 means we need
 			# to strip away the final newline
 			if not chunk_translated:
-				chunk_translated = utf8_str_to_unicode_type(translation.gettext(chunk[:-1]))
+				chunk_translated = translation.gettext(chunk[:-1])
 			
 		# check if we only do full translation records
 		if not chunk_translated:
@@ -77,7 +77,7 @@
 	# build a Translation package record
 	res = ""
 	res = "Package: %s\n" % pkg
-	res += "Description-md5: %s\n" % str(apt_pkg.md5sum(descr+"\n"))
+	res += "Description-md5: %s\n" % str(apt_pkg.md5sum(descr.encode()+b"\n"))
 	res += "Description-%s: %s\n" % (lang, short_descr_trans)
 	long_descr_str = ""
 	for chunk in long_descr_chunks_trans:
@@ -102,7 +102,7 @@
 				long_descr_str += "\n .\n%s" % chunk
 	res += "%s\n\n" % long_descr_str
 	# convert back to a utf8 encoded string
-	return unicode_type_to_utf8_str(res)
+	return res
 
 def po2translation(inf, out, pofile, lang, fulltrans=False):
 	if not os.path.exists("mo/%s/LC_MESSAGES" % lang):
@@ -112,7 +112,7 @@
 	localedir= os.getcwd()+"/mo"
 	translation = gettext.translation('packages', localedir, [lang])
 	if not translation:
-		print "Error creating translation object"
+		print("Error creating translation object")
 		sys.exit(1)
 	translation.add_fallback(NoneTranslationFallback())
 
@@ -132,13 +132,13 @@
 
 
 if __name__ == "__main__":
-        logging.basicConfig(level=logging.INFO, 
-                            format="%(asctime)s %(message)s")
+	logging.basicConfig(level=logging.INFO,
+	                    format="%(asctime)s %(message)s")
 
 	if len(sys.argv) < 4:
-		print "need a Packages file a po file and a language as argument"
-		print "it will search for the mo file in "
-		print "mo/$lang/LC_MESSAGES/packages.mo"
+		print("need a Packages file a po file and a language as argument")
+		print("it will search for the mo file in ")
+		print("mo/$lang/LC_MESSAGES/packages.mo")
 		sys.exit(1)
 
 	inf = open(sys.argv[1])
@@ -154,5 +154,5 @@
 		logging.error("Can't find '%s', exiting" % pofile)
 		sys.exit(1)
 
-        logging.debug("working on %s" % pofile)
+	logging.debug("working on %s" % pofile)
 	po2translation(inf, out, pofile, lang, fulltrans)
 
=== modified file 'potmodify.py'
--- potmodify.py	2020-04-16 12:01:22 +0000
+++ potmodify.py	2023-04-14 03:34:28 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/python2
+#! /usr/bin/python3
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2008 István Nyitrai <[e-mail]>
 
=== modified file 'series.sh'
--- series.sh	2020-04-16 12:01:22 +0000
+++ series.sh	2023-04-14 03:34:28 +0000
@@ -1,7 +1,5 @@
 
 # the series to use (default auto-detect)
-#SERIES=$(lsb_release -s -c)
-SERIES="focal"
+SERIES="$(distro-info -d)"
 
 DIST="$SERIES"
-
 
=== modified file 'translation2po.py'
--- translation2po.py	2020-04-16 12:01:22 +0000
+++ translation2po.py	2023-04-14 03:34:28 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
 
 import string
 import apt_pkg
@@ -110,7 +110,7 @@
 "Content-Transfer-Encoding: 8bit\\n"
 \n
 """)
-        all_chunks = set()
+	all_chunks = set()
 	parser = apt_pkg.TagFile(inf)
 	parser_trans = apt_pkg.TagFile(open(transf))
 	while parser.step():
@@ -122,13 +122,13 @@
 		# we have a descr for that pkg
 		if descr != None and descr_trans != None:
 			md5_trans = parser_trans.section.get("Description-md5")
-			md5 = str(apt_pkg.md5sum(descr+"\n"))
+			md5 = str(apt_pkg.md5sum(descr.encode()+b"\n"))
 			#print "'%s'" % descr
 			#print "'%s'" % descr_trans
 			#print "md5: %s -> trans: %s " % (md5, md5_trans)
 			if md5 == md5_trans:
 				res = descr_to_po(pkg, descr, descr_trans, all_chunks)
-				out.write(res.encode('utf-8'))
+				out.write(res)
 
 
 if __name__ == "__main__":
@@ -136,10 +136,10 @@
 	#sys.exit(1)
 
 	if len(sys.argv) < 4:
-		print "%s Packages Translation lang" % sys.argv[0]
-		print "need a Packages file and a Translation-$LANG file "
-		print "and a lang (e.g. Packages Translation-de de) "
-		print " it will generate a po file from that"
+		print("%s Packages Translation lang" % sys.argv[0])
+		print("need a Packages file and a Translation-$LANG file ")
+		print("and a lang (e.g. Packages Translation-de de) ")
+		print(" it will generate a po file from that")
 		sys.exit(1)
 
 	inf = open(sys.argv[1])
 
=== modified file 'ubuntu/packages/ddtp-upload/debian/changelog'
--- ubuntu/packages/ddtp-upload/debian/changelog	2020-04-16 12:01:22 +0000
+++ ubuntu/packages/ddtp-upload/debian/changelog	2023-04-14 03:34:28 +0000
@@ -1,3 +1,9 @@
+ddtp-translations (20230413.1) lunar; urgency=medium
+
+  * new translations update
+
+ -- Steve Langasek <[e-mail]>  Thu, 13 Apr 2023 19:13:28 -0700
+
 ddtp-translations (20200110.1) focal; urgency=medium
 
   * new translations update
 
=== modified file 'ubuntu/verify-translation-file.py'
--- ubuntu/verify-translation-file.py	2020-04-16 12:01:22 +0000
+++ ubuntu/verify-translation-file.py	2023-04-14 03:34:28 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
 
 import apt_pkg
 import sys
@@ -13,8 +13,8 @@
             tf.section.get("Package") and 
             tf.section.get("Description-md5") and
             tf.section.get("Description-%s" % locale)):
-        print "Invalid: '%s'" % tf.section
-        print
+        print("Invalid: '%s'" % tf.section)
+        print()
         bad = True
         break
 
 
=== modified file 'utils.py'
--- utils.py	2020-04-16 12:01:22 +0000
+++ utils.py	2023-04-14 03:34:28 +0000
@@ -8,18 +8,6 @@
     return string.encode('utf-8')
   return unicode(string, 'latin1').encode('utf-8')
 
-def utf8_str_to_unicode_type(s):
-  """ take a utf8 encoded str and return a unicode object """
-  if not s:
-    return s
-  return s.decode('utf-8')
-
-def unicode_type_to_utf8_str(u):
-  """ take a unicode object and return a utf8 encoded str object """
-  if not u:
-    return u
-  return u.encode('utf-8')
-
 def parse_descr(descr):
   """ input. debian description (str)
       output (short_descr: (str), long_descr_chunks: (list of str)
@@ -34,7 +22,6 @@
       short_descr = raw.strip()
     # new chunk
     elif raw.strip() == ".":
-      current = utf8_str_to_unicode_type(current)
       long_descr_chunks.append(current)
       current = ""
     # two spaces is handled differently (as a raw format, see debian policy)
@@ -57,9 +44,8 @@
       else:
         current = raw.strip()
   # add last chunk
-  current = utf8_str_to_unicode_type(current)
   long_descr_chunks.append(current)
-  return (utf8_str_to_unicode_type(short_descr),  long_descr_chunks)
+  return (short_descr,  long_descr_chunks)