From cbd5afe2c0434eabd6b6fab51b6108b605e8d561 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Mon, 21 May 2018 10:14:34 +1200 Subject: [PATCH] move imports of i18n higher so _ is always installed before tests are imported --- bin/subiquity-tui | 1 - console_conf/__init__.py | 2 ++ subiquity/__init__.py | 2 ++ subiquitycore/__init__.py | 2 ++ subiquitycore/ui/form.py | 1 - 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/subiquity-tui b/bin/subiquity-tui index 08de9674..d131a18f 100755 --- a/bin/subiquity-tui +++ b/bin/subiquity-tui @@ -20,7 +20,6 @@ import os import signal import sys -from subiquitycore.i18n import * from subiquitycore.log import setup_logger from subiquitycore import __version__ as VERSION from subiquitycore.core import ApplicationError diff --git a/console_conf/__init__.py b/console_conf/__init__.py index ef34c23e..49c8381d 100644 --- a/console_conf/__init__.py +++ b/console_conf/__init__.py @@ -14,3 +14,5 @@ # along with this program. If not, see . """ Console-Conf """ + +import subiquitycore.i18n diff --git a/subiquity/__init__.py b/subiquity/__init__.py index 6e7ce7e1..51ec1fe1 100644 --- a/subiquity/__init__.py +++ b/subiquity/__init__.py @@ -16,3 +16,5 @@ """ Subiquity """ __version__ = "0.0.5" + +import subiquitycore.i18n diff --git a/subiquitycore/__init__.py b/subiquitycore/__init__.py index fd227128..04f0fe56 100644 --- a/subiquitycore/__init__.py +++ b/subiquitycore/__init__.py @@ -16,3 +16,5 @@ """ SubiquityCore """ __version__ = "0.0.5" + +import subiquitycore.i18n diff --git a/subiquitycore/ui/form.py b/subiquitycore/ui/form.py index a853c08a..5bab9d13 100644 --- a/subiquitycore/ui/form.py +++ b/subiquitycore/ui/form.py @@ -28,7 +28,6 @@ from urwid import ( WidgetWrap, ) -from subiquitycore.i18n import * from subiquitycore.ui.buttons import cancel_btn, done_btn from subiquitycore.ui.container import Columns, Pile from subiquitycore.ui.interactive import (