From fc4452ff0a56f40223a18e2edc9b119074d8b9b8 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Tue, 18 Oct 2011 17:09:48 +0200 Subject: [PATCH] [entropy] move text_tools module from client/ to entropy package (entropy.cli) --- client/equo.py | 6 +++--- client/text_query.py | 2 +- client/text_repositories.py | 2 +- client/text_security.py | 2 +- client/text_ugc.py | 2 +- client/text_ui.py | 3 +-- client/text_tools.py => lib/entropy/cli.py | 4 +++- misc/po/POTFILES.in | 7 +++---- server/eit/commands/status.py | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) rename client/text_tools.py => lib/entropy/cli.py (98%) diff --git a/client/equo.py b/client/equo.py index 729d0e0f7..fdfbfaed2 100644 --- a/client/equo.py +++ b/client/equo.py @@ -35,7 +35,7 @@ except ImportError: from entropy.output import red, darkred, darkgreen, TextInterface, \ print_generic, print_error, print_warning, readtext, nocolor, \ is_stdout_a_tty, bold, purple, teal, blue -from text_tools import print_menu, print_bashcomp, read_equo_release +from entropy.cli import print_menu, print_bashcomp, read_equo_release from entropy.const import etpConst, etpUi, const_convert_to_rawstring import entropy.tools try: @@ -356,7 +356,7 @@ def _do_text_cleanup(main_cmd, options): acquired = False client = None try: - import text_tools + from entropy.cli import cleanup from entropy.client.interfaces import Client client = Client(repo_validation = False, indexing = False, installed_repo = False) @@ -373,7 +373,7 @@ def _do_text_cleanup(main_cmd, options): dirs.append(os.path.join(etpConst['entropyworkdir'], rel)) # new location dirs.append(os.path.join(etpConst['entropypackagesworkdir'], rel)) - text_tools.cleanup(dirs) + cleanup(dirs) return 0 finally: diff --git a/client/text_query.py b/client/text_query.py index 445a86b81..71dcd481b 100644 --- a/client/text_query.py +++ b/client/text_query.py @@ -21,7 +21,7 @@ from entropy.i18n import _ import entropy.dep import entropy.tools -from text_tools import print_table, get_file_mime, enlightenatom +from entropy.cli import print_table, get_file_mime, enlightenatom def query(options): diff --git a/client/text_repositories.py b/client/text_repositories.py index c28e8623a..ee8d75ca5 100644 --- a/client/text_repositories.py +++ b/client/text_repositories.py @@ -27,7 +27,7 @@ from entropy.misc import ParallelTask from entropy.i18n import _ from entropy.services.client import WebService -from text_tools import print_table, get_entropy_webservice +from entropy.cli import print_table, get_entropy_webservice import entropy.tools SystemSettings = SysSet() diff --git a/client/text_security.py b/client/text_security.py index 837fc3dc1..9c2d1edb6 100644 --- a/client/text_security.py +++ b/client/text_security.py @@ -14,7 +14,7 @@ from entropy.const import etpConst, etpUi from entropy.output import red, darkred, blue, brown, darkgreen, darkblue, \ bold, purple, green, teal, print_error, print_warning, print_info, \ print_generic -from text_tools import print_table +from entropy.cli import print_table from entropy.i18n import _ import entropy.tools diff --git a/client/text_ugc.py b/client/text_ugc.py index a8c07934b..e850eccf0 100644 --- a/client/text_ugc.py +++ b/client/text_ugc.py @@ -17,7 +17,7 @@ from entropy.services.client import WebService from entropy.client.services.interfaces import Document, DocumentFactory, \ ClientWebService from entropy.i18n import _ -from text_tools import get_entropy_webservice as _get_service +from entropy.cli import get_entropy_webservice as _get_service import entropy.tools diff --git a/client/text_ui.py b/client/text_ui.py index d5c07a194..47b229efc 100644 --- a/client/text_ui.py +++ b/client/text_ui.py @@ -32,8 +32,7 @@ from entropy.client.interfaces import Client from entropy.client.interfaces.package import Package as ClientPkg from entropy.i18n import _ from entropy.services.client import WebService - -from text_tools import countdown, enlightenatom, get_entropy_webservice +from entropy.cli import countdown, enlightenatom, get_entropy_webservice import entropy.dep import entropy.tools diff --git a/client/text_tools.py b/lib/entropy/cli.py similarity index 98% rename from client/text_tools.py rename to lib/entropy/cli.py index 7b88c8543..aaa40668e 100644 --- a/client/text_tools.py +++ b/lib/entropy/cli.py @@ -6,7 +6,9 @@ @copyright: Fabio Erculiani @license: GPL-2 - B{Entropy Client text-based tools}. + B{Entropy misc command line interface (CLI) module}. + In this module are enclosed all the miscellaneous functions + used by Command Line based applications. """ import sys diff --git a/misc/po/POTFILES.in b/misc/po/POTFILES.in index d50f619da..c8464c874 100644 --- a/misc/po/POTFILES.in +++ b/misc/po/POTFILES.in @@ -1,12 +1,11 @@ -../client/text_tools.py ../client/text_cache.py ../client/text_security.py -../client/text_smart.py -../client/text_query.py ../client/text_repositories.py ../client/text_configuration.py ../client/text_ugc.py +../client/text_query.py ../client/text_rescue.py +../client/text_smart.py ../client/equo.py ../client/text_ui.py ../server/eit.py @@ -52,11 +51,11 @@ ../sulfur/src/sulfur_client.py ../sulfur/src/sulfur/views.py ../sulfur/src/sulfur/packages.py -../sulfur/src/sulfur/dialogs.py ../sulfur/src/sulfur/event.py ../sulfur/src/sulfur/setup.py ../sulfur/src/sulfur/package.py ../sulfur/src/sulfur/__init__.py +../sulfur/src/sulfur/dialogs.py ../sulfur/src/sulfur/events.py ../sulfur/src/sulfur/core.py ../sulfur/src/sulfur/entropyapi.py diff --git a/server/eit/commands/status.py b/server/eit/commands/status.py index ab8b243a3..58cbb9e10 100644 --- a/server/eit/commands/status.py +++ b/server/eit/commands/status.py @@ -18,7 +18,7 @@ from entropy.i18n import _ from entropy.output import darkgreen, teal, brown, darkred, \ bold, purple, blue -from text_tools import print_table +from entropy.cli import print_table from eit.commands.descriptor import EitCommandDescriptor from eit.commands.command import EitCommand