From 8a06d0ab869b6b4fd5b6d80da84465ae7df6414d Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Mon, 25 May 2009 19:10:29 +0200 Subject: [PATCH] fine tune some module imports --- libraries/entropy/client/interfaces/client.py | 2 +- libraries/entropy/client/interfaces/package.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/entropy/client/interfaces/client.py b/libraries/entropy/client/interfaces/client.py index 2b0bda6df..0282db46a 100644 --- a/libraries/entropy/client/interfaces/client.py +++ b/libraries/entropy/client/interfaces/client.py @@ -33,6 +33,7 @@ from entropy.client.interfaces.methods import RepositoryMixin, MiscMixin, \ from entropy.client.interfaces.fetch import FetchersMixin from entropy.const import etpConst, etpCache from entropy.core import SystemSettings, SystemSettingsPlugin +from entropy.misc import LogFile from entropy.exceptions import SystemDatabaseError, RepositoryError class ClientSystemSettingsPlugin(SystemSettingsPlugin): @@ -189,7 +190,6 @@ class Client(Singleton, TextInterface, LoadersMixin, CacheMixin, CalculatorsMixi import entropy.tools as entropyTools self.dumpTools = dumpTools self.entropyTools = entropyTools - from entropy.misc import LogFile self.clientLog = LogFile(level = self.SystemSettings['system']['log_level'], filename = etpConst['equologfile'], header = "[client]") diff --git a/libraries/entropy/client/interfaces/package.py b/libraries/entropy/client/interfaces/package.py index 15893da8d..8b476e174 100644 --- a/libraries/entropy/client/interfaces/package.py +++ b/libraries/entropy/client/interfaces/package.py @@ -28,10 +28,12 @@ import shutil from entropy.const import * from entropy.exceptions import * from entropy.i18n import _ -from entropy.output import TextInterface, brown, blue, bold, darkgreen, darkblue, red, purple, darkred, print_info, print_error, print_warning +from entropy.output import TextInterface, brown, blue, bold, darkgreen, \ + darkblue, red, purple, darkred, print_info, print_error, print_warning from entropy.misc import TimeScheduled from entropy.db import dbapi2, LocalRepository from entropy.client.interfaces.client import Client +from entropy.cache import EntropyCacher class Package: @@ -43,7 +45,7 @@ class Package: mytxt = _("A valid Client instance or subclass is needed") raise IncorrectParameter("IncorrectParameter: %s" % (mytxt,)) self.Entropy = EquoInstance - from entropy.cache import EntropyCacher + self.Cacher = EntropyCacher() self.infoDict = {} self.prepared = False