From 54d6196698c7676cd73784136c95408c5b283ff6 Mon Sep 17 00:00:00 2001 From: Florent Rougon Date: Fri, 15 Sep 2017 18:13:54 +0200 Subject: [PATCH] i18n Python scripts: minor changes - Remove unnecessary imports These imports were a leftover from early versions; now, they are done in modules such as flightgear.meta.i18n and don't need to be in the calling scripts anymore. - Fix an exception message --- python3-flightgear/fg-convert-translation-files | 5 ----- python3-flightgear/fg-new-translations | 5 ----- python3-flightgear/fg-update-translation-files | 5 ----- python3-flightgear/flightgear/meta/i18n.py | 3 +-- 4 files changed, 1 insertion(+), 17 deletions(-) diff --git a/python3-flightgear/fg-convert-translation-files b/python3-flightgear/fg-convert-translation-files index 95d77be..bd03695 100755 --- a/python3-flightgear/fg-convert-translation-files +++ b/python3-flightgear/fg-convert-translation-files @@ -24,11 +24,6 @@ import locale import os import sys -try: - import xml.etree.ElementTree as et -except ImportError: - import elementtree.ElementTree as et - import flightgear.meta.logging import flightgear.meta.i18n as fg_i18n diff --git a/python3-flightgear/fg-new-translations b/python3-flightgear/fg-new-translations index 0da1453..ee6835f 100755 --- a/python3-flightgear/fg-new-translations +++ b/python3-flightgear/fg-new-translations @@ -24,11 +24,6 @@ import locale import os import sys -try: - import xml.etree.ElementTree as et -except ImportError: - import elementtree.ElementTree as et - import flightgear.meta.logging import flightgear.meta.i18n as fg_i18n diff --git a/python3-flightgear/fg-update-translation-files b/python3-flightgear/fg-update-translation-files index e3c4c10..26b35b3 100755 --- a/python3-flightgear/fg-update-translation-files +++ b/python3-flightgear/fg-update-translation-files @@ -25,11 +25,6 @@ import locale import os import sys -try: - import xml.etree.ElementTree as et -except ImportError: - import elementtree.ElementTree as et - import flightgear.meta.logging import flightgear.meta.i18n as fg_i18n diff --git a/python3-flightgear/flightgear/meta/i18n.py b/python3-flightgear/flightgear/meta/i18n.py index 6eba1e8..bc77dbe 100644 --- a/python3-flightgear/flightgear/meta/i18n.py +++ b/python3-flightgear/flightgear/meta/i18n.py @@ -684,8 +684,7 @@ class Translation: def mergeMasterForCategory(self, masterTransl, cat, logger=dummyLogger): if cat not in masterTransl: - raise BadAPIUse("Bad API use: category {!r} not in " \ - "'masterTransl'".format(cat)) + raise BadAPIUse("category {!r} not in 'masterTransl'".format(cat)) elif cat not in self: # Category appeared in 'masterTransl' that wasn't in 'self' self.resetCategory(cat)