|
Seth Vidal |
e80406d |
diff --git a/yum/__init__.py b/yum/__init__.py
|
|
Seth Vidal |
e80406d |
index 6e06005..a5b4922 100644
|
|
Seth Vidal |
e80406d |
--- a/yum/__init__.py
|
|
Seth Vidal |
e80406d |
+++ b/yum/__init__.py
|
|
Seth Vidal |
e80406d |
@@ -32,9 +32,9 @@ import logging.config
|
|
Seth Vidal |
e80406d |
import operator
|
|
Seth Vidal |
e80406d |
import gzip
|
|
Seth Vidal |
e80406d |
|
|
Seth Vidal |
e80406d |
-import i18n
|
|
Seth Vidal |
e80406d |
-_ = i18n._
|
|
Seth Vidal |
e80406d |
-P_ = i18n.P_
|
|
Seth Vidal |
e80406d |
+import yum.i18n
|
|
Seth Vidal |
e80406d |
+_ = yum.i18n._
|
|
Seth Vidal |
e80406d |
+P_ = yum.i18n.P_
|
|
Seth Vidal |
e80406d |
|
|
Seth Vidal |
e80406d |
import config
|
|
Seth Vidal |
e80406d |
from config import ParsingError, ConfigParser
|
|
Seth Vidal |
e80406d |
@@ -57,15 +57,15 @@ import plugins
|
|
Seth Vidal |
e80406d |
import logginglevels
|
|
Seth Vidal |
e80406d |
import yumRepo
|
|
Seth Vidal |
e80406d |
import callbacks
|
|
Seth Vidal |
e80406d |
-import history
|
|
Seth Vidal |
e80406d |
+import yum.history
|
|
Seth Vidal |
e80406d |
|
|
Seth Vidal |
e80406d |
import warnings
|
|
Seth Vidal |
e80406d |
warnings.simplefilter("ignore", Errors.YumFutureDeprecationWarning)
|
|
Seth Vidal |
e80406d |
|
|
Seth Vidal |
e80406d |
from packages import parsePackages, YumAvailablePackage, YumLocalPackage, YumInstalledPackage, comparePoEVR
|
|
Seth Vidal |
e80406d |
from constants import *
|
|
Seth Vidal |
e80406d |
-from rpmtrans import RPMTransaction,SimpleCliCallBack
|
|
Seth Vidal |
e80406d |
-from i18n import to_unicode, to_str
|
|
Seth Vidal |
e80406d |
+from yum.rpmtrans import RPMTransaction,SimpleCliCallBack
|
|
Seth Vidal |
e80406d |
+from yum.i18n import to_unicode, to_str
|
|
Seth Vidal |
e80406d |
|
|
Seth Vidal |
e80406d |
import string
|
|
Seth Vidal |
e80406d |
|
|
Seth Vidal |
e80406d |
diff --git a/yum/comps.py b/yum/comps.py
|
|
Seth Vidal |
e80406d |
index d310b1b..2048c77 100755
|
|
Seth Vidal |
e80406d |
--- a/yum/comps.py
|
|
Seth Vidal |
e80406d |
+++ b/yum/comps.py
|
|
Seth Vidal |
e80406d |
@@ -26,7 +26,7 @@ from Errors import CompsException
|
|
Seth Vidal |
e80406d |
# switch all compsexceptions to grouperrors after api break
|
|
Seth Vidal |
e80406d |
import fnmatch
|
|
Seth Vidal |
e80406d |
import re
|
|
Seth Vidal |
e80406d |
-from i18n import to_unicode
|
|
Seth Vidal |
e80406d |
+from yum.i18n import to_unicode
|
|
Seth Vidal |
e80406d |
from misc import get_my_lang_code
|
|
Seth Vidal |
e80406d |
|
|
Seth Vidal |
e80406d |
lang_attr = '{http://www.w3.org/XML/1998/namespace}lang'
|
|
Seth Vidal |
e80406d |
diff --git a/yum/history.py b/yum/history.py
|
|
Seth Vidal |
e80406d |
index 18d2a41..644c2fc 100644
|
|
Seth Vidal |
e80406d |
--- a/yum/history.py
|
|
Seth Vidal |
e80406d |
+++ b/yum/history.py
|
|
Seth Vidal |
e80406d |
@@ -23,10 +23,11 @@ import glob
|
|
Seth Vidal |
e80406d |
from weakref import proxy as weakref
|
|
Seth Vidal |
e80406d |
|
|
Seth Vidal |
e80406d |
from sqlutils import sqlite, executeSQL
|
|
Seth Vidal |
e80406d |
-import misc
|
|
Seth Vidal |
e80406d |
-from constants import *
|
|
Seth Vidal |
e80406d |
-from packages import YumInstalledPackage, YumAvailablePackage, PackageObject
|
|
Seth Vidal |
e80406d |
-from i18n import to_unicode
|
|
Seth Vidal |
e80406d |
+import yum.misc
|
|
Seth Vidal |
e80406d |
+import yum.constants
|
|
Seth Vidal |
e80406d |
+from yum.constants import *
|
|
Seth Vidal |
e80406d |
+from yum.packages import YumInstalledPackage, YumAvailablePackage, PackageObject
|
|
Seth Vidal |
e80406d |
+from yum.i18n import to_unicode
|
|
Seth Vidal |
e80406d |
|
|
Seth Vidal |
e80406d |
_history_dir = '/var/lib/yum/history'
|
|
Seth Vidal |
e80406d |
|
|
Seth Vidal |
e80406d |
diff --git a/yum/plugins.py b/yum/plugins.py
|
|
Seth Vidal |
e80406d |
index c0e510f..02f0d57 100644
|
|
Seth Vidal |
e80406d |
--- a/yum/plugins.py
|
|
Seth Vidal |
e80406d |
+++ b/yum/plugins.py
|
|
Seth Vidal |
e80406d |
@@ -34,7 +34,7 @@ from weakref import proxy as weakref
|
|
Seth Vidal |
e80406d |
|
|
Seth Vidal |
e80406d |
from yum import _
|
|
Seth Vidal |
e80406d |
|
|
Seth Vidal |
e80406d |
-from i18n import utf8_width
|
|
Seth Vidal |
e80406d |
+from yum.i18n import utf8_width
|
|
Seth Vidal |
e80406d |
|
|
Seth Vidal |
e80406d |
# TODO: expose rpm package sack objects to plugins (once finished)
|
|
Seth Vidal |
e80406d |
# TODO: allow plugins to use the existing config stuff to define options for
|
|
Seth Vidal |
e80406d |
diff --git a/yum/rpmsack.py b/yum/rpmsack.py
|
|
Seth Vidal |
e80406d |
index 74dd69d..fd05f9b 100644
|
|
Seth Vidal |
e80406d |
--- a/yum/rpmsack.py
|
|
Seth Vidal |
e80406d |
+++ b/yum/rpmsack.py
|
|
Seth Vidal |
e80406d |
@@ -31,7 +31,7 @@ from packageSack import PackageSackBase, PackageSackVersion
|
|
Seth Vidal |
e80406d |
import fnmatch
|
|
Seth Vidal |
e80406d |
import re
|
|
Seth Vidal |
e80406d |
|
|
Seth Vidal |
e80406d |
-from i18n import to_unicode
|
|
Seth Vidal |
e80406d |
+from yum.i18n import to_unicode
|
|
Seth Vidal |
e80406d |
import constants
|
|
Seth Vidal |
e80406d |
|
|
Seth Vidal |
e80406d |
class RPMInstalledPackage(YumInstalledPackage):
|
|
Seth Vidal |
e80406d |
diff --git a/yum/rpmtrans.py b/yum/rpmtrans.py
|
|
Seth Vidal |
e80406d |
index ed52df0..b1b896f 100644
|
|
Seth Vidal |
e80406d |
--- a/yum/rpmtrans.py
|
|
Seth Vidal |
e80406d |
+++ b/yum/rpmtrans.py
|
|
Seth Vidal |
e80406d |
@@ -23,7 +23,7 @@ import time
|
|
Seth Vidal |
e80406d |
import logging
|
|
Seth Vidal |
e80406d |
import types
|
|
Seth Vidal |
e80406d |
import sys
|
|
Seth Vidal |
e80406d |
-from constants import *
|
|
Seth Vidal |
e80406d |
+from yum.constants import *
|
|
Seth Vidal |
e80406d |
from yum import _
|
|
Seth Vidal |
e80406d |
import misc
|
|
Seth Vidal |
e80406d |
|
|
Seth Vidal |
e80406d |
diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
|
|
Seth Vidal |
e80406d |
index 89744ff..ce2988f 100644
|
|
Seth Vidal |
e80406d |
--- a/yum/sqlitesack.py
|
|
Seth Vidal |
e80406d |
+++ b/yum/sqlitesack.py
|
|
Seth Vidal |
e80406d |
@@ -33,8 +33,8 @@ import rpmUtils.miscutils
|
|
Seth Vidal |
e80406d |
import sqlutils
|
|
Seth Vidal |
e80406d |
import constants
|
|
Seth Vidal |
e80406d |
import operator
|
|
Seth Vidal |
e80406d |
-from misc import seq_max_split
|
|
Seth Vidal |
e80406d |
-from i18n import to_utf8, to_unicode
|
|
Seth Vidal |
e80406d |
+from yum.misc import seq_max_split
|
|
Seth Vidal |
e80406d |
+from yum.i18n import to_utf8, to_unicode
|
|
Seth Vidal |
e80406d |
import sys
|
|
Seth Vidal |
e80406d |
import re
|
|
Seth Vidal |
e80406d |
|
|
Seth Vidal |
e80406d |
diff --git a/yum/update_md.py b/yum/update_md.py
|
|
Seth Vidal |
e80406d |
index 34179ea..b3a120e 100644
|
|
Seth Vidal |
e80406d |
--- a/yum/update_md.py
|
|
Seth Vidal |
e80406d |
+++ b/yum/update_md.py
|
|
Seth Vidal |
e80406d |
@@ -24,10 +24,10 @@ Update metadata (updateinfo.xml) parsing.
|
|
Seth Vidal |
e80406d |
import sys
|
|
Seth Vidal |
e80406d |
import gzip
|
|
Seth Vidal |
e80406d |
|
|
Seth Vidal |
e80406d |
-from i18n import utf8_text_wrap, to_utf8
|
|
Seth Vidal |
e80406d |
-from yumRepo import YumRepository
|
|
Seth Vidal |
e80406d |
-from packages import FakeRepository
|
|
Seth Vidal |
e80406d |
-from misc import to_xml
|
|
Seth Vidal |
e80406d |
+from yum.i18n import utf8_text_wrap, to_utf8
|
|
Seth Vidal |
e80406d |
+from yum.yumRepo import YumRepository
|
|
Seth Vidal |
e80406d |
+from yum.packages import FakeRepository
|
|
Seth Vidal |
e80406d |
+from yum.misc import to_xml
|
|
Seth Vidal |
e80406d |
import Errors
|
|
Seth Vidal |
e80406d |
|
|
Seth Vidal |
e80406d |
import rpmUtils.miscutils
|
|
Seth Vidal |
e80406d |
diff --git a/yum/yumRepo.py b/yum/yumRepo.py
|
|
Seth Vidal |
e80406d |
index 2bc7476..ea8518a 100644
|
|
Seth Vidal |
e80406d |
--- a/yum/yumRepo.py
|
|
Seth Vidal |
e80406d |
+++ b/yum/yumRepo.py
|
|
Seth Vidal |
e80406d |
@@ -32,9 +32,9 @@ from repos import Repository
|
|
Seth Vidal |
e80406d |
import parser
|
|
Seth Vidal |
e80406d |
import sqlitecachec
|
|
Seth Vidal |
e80406d |
import sqlitesack
|
|
Seth Vidal |
e80406d |
-import config
|
|
Seth Vidal |
e80406d |
-import misc
|
|
Seth Vidal |
e80406d |
-import comps
|
|
Seth Vidal |
e80406d |
+from yum import config
|
|
Seth Vidal |
e80406d |
+from yum import misc
|
|
Seth Vidal |
e80406d |
+from yum import comps
|
|
Seth Vidal |
e80406d |
from constants import *
|
|
Seth Vidal |
e80406d |
import metalink
|
|
Seth Vidal |
e80406d |
|