From 7362797306c3f2e2b7152d8b60472ba57238a0d9 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Mon, 8 Sep 2014 10:40:34 -0400
Subject: [PATCH 03/12] Centralize call to setup_i18n in virtinst __init__

No need to call it twice

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1111986

(cherry picked from commit 17f57eaaa7f025b3d5b1dc390fe965feccc9f4f6)
---
 virt-manager         |  3 +--
 virtcli/cliutils.py  | 35 -----------------------------------
 virtinst/__init__.py | 20 +++++++++++++++++---
 3 files changed, 18 insertions(+), 40 deletions(-)
 delete mode 100644 virtcli/cliutils.py

diff --git a/virt-manager b/virt-manager
index d352b90..d589f6e 100755
--- a/virt-manager
+++ b/virt-manager
@@ -31,7 +31,7 @@ from gi.repository import LibvirtGLib
 
 from virtinst import util as util
 from virtinst import cli as virtinstcli
-from virtcli import cliutils, cliconfig
+from virtcli import cliconfig
 
 
 try:
@@ -139,7 +139,6 @@ def launch_specific_window(engine, show, uri, clistr):
 
 
 def main():
-    cliutils.setup_i18n()
     (options, leftovers) = parse_commandline()
 
     virtinstcli.setupLogging("virt-manager", options.debug, False, False)
diff --git a/virtcli/cliutils.py b/virtcli/cliutils.py
deleted file mode 100644
index 261de55..0000000
--- a/virtcli/cliutils.py
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright (C) 2011, 2013 Red Hat, Inc.
-# Copyright (C) 2011 Cole Robinson <crobinso@redhat.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA.
-#
-
-import gettext
-import locale
-
-from virtcli import cliconfig
-
-
-def setup_i18n():
-    try:
-        locale.setlocale(locale.LC_ALL, '')
-    except:
-        # Can happen if user passed a bogus LANG
-        pass
-
-    gettext.install("virt-manager", cliconfig.gettext_dir)
-    gettext.bindtextdomain("virt-manager", cliconfig.gettext_dir)
diff --git a/virtinst/__init__.py b/virtinst/__init__.py
index adb4e70..20fdc91 100644
--- a/virtinst/__init__.py
+++ b/virtinst/__init__.py
@@ -15,11 +15,25 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA 02110-1301 USA.
 
-from virtcli import cliconfig, cliutils
-stable_defaults = cliconfig.stable_defaults
-cliutils.setup_i18n()
+from virtcli import cliconfig as _cliconfig
 
 
+def _setup_i18n():
+    import gettext
+    import locale
+
+    try:
+        locale.setlocale(locale.LC_ALL, '')
+    except:
+        # Can happen if user passed a bogus LANG
+        pass
+
+    gettext.install("virt-manager", _cliconfig.gettext_dir)
+    gettext.bindtextdomain("virt-manager", _cliconfig.gettext_dir)
+
+_setup_i18n()
+stable_defaults = _cliconfig.stable_defaults
+
 from virtinst import util
 from virtinst import support
 
-- 
1.9.3