From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 9 Apr 2011 14:01:27 +0000 (+0200)
Subject: Remove some ugly imports.
X-Git-Tag: 0.9.3~47^2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=53bb796038c5fc8c22614c3e4586c046ad24297b;p=pakfire.git

Remove some ugly imports.
---

diff --git a/pakfire/base.py b/pakfire/base.py
index 965e30f7d..a5bffe4d8 100644
--- a/pakfire/base.py
+++ b/pakfire/base.py
@@ -5,18 +5,16 @@ import os
 import random
 import string
 
+import config
 import depsolve
 import distro
 import logger
 import packages
+import repository
 import transaction
 import util
 
-from config import Config
 from constants import *
-from distro import Distribution
-from errors import BuildError, PakfireError
-from repository import Repositories
 from i18n import _
 
 __version__ = PAKFIRE_VERSION
@@ -38,7 +36,7 @@ class Pakfire(object):
 			# XXX check if we are actually running on an ipfire system.
 
 		# Read configuration file(s)
-		self.config = Config(pakfire=self)
+		self.config = config.Config(pakfire=self)
 		for filename in configs:
 			self.config.read(filename)
 
@@ -48,8 +46,8 @@ class Pakfire(object):
 
 		# Get more information about the distribution we are running
 		# or building
-		self.distro = Distribution(self, distro_config)
-		self.repos  = Repositories(self)
+		self.distro = distro.Distribution(self, distro_config)
+		self.repos  = repository.Repositories(self)
 
 		# XXX Disable repositories if passed on command line
 		#if disable_repos:
diff --git a/pakfire/constants.py b/pakfire/constants.py
index fc9464529..44ea7ff1f 100644
--- a/pakfire/constants.py
+++ b/pakfire/constants.py
@@ -2,6 +2,8 @@
 
 import os.path
 
+from errors import *
+
 PAKFIRE_VERSION = "0.9.2"
 
 SYSCONFDIR = "/etc"