[yum-commits] Branch 'yum-3_2_X' - 2 commits - yum/comps.py yum/history.py yum/__init__.py yum/plugins.py yum/rpmsack.py yum/rpmtrans.py yum/sqlitesack.py yum/update_md.py yum/yumRepo.py

[skvidal at osuosl.org]

 yum/__init__.py   |   12 ++++++------
 yum/comps.py      |    2 +-
 yum/history.py    |    9 +++++----
 yum/plugins.py    |    2 +-
 yum/rpmsack.py    |    2 +-
 yum/rpmtrans.py   |    2 +-
 yum/sqlitesack.py |    4 ++--
 yum/update_md.py  |    8 ++++----
 yum/yumRepo.py    |    6 +++---
 9 files changed, 24 insertions(+), 23 deletions(-)

New commits:
commit 8b5553c003886b833eca75d15800e63870e1687a
Merge: 1dccb47... 2e5b8c4...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed Sep 30 17:06:00 2009 -0400

    Merge branch 'yum-3_2_X' of ssh://yum.baseurl.org/srv/projects/yum/git/yum into yum-3_2_X
    
    * 'yum-3_2_X' of ssh://yum.baseurl.org/srv/projects/yum/git/yum:
      Fix logger calls in yumRepo, atm. we traceback due to no self.logger

commit 1dccb47689d110a163f8d982ccb595245ed5b7f9
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed Sep 30 14:27:47 2009 -0400

    revert yum. import patch
    reverts e2d9da32940161fd5f8ddf28ff7632502618affb as it breaks a bunch of
          things - and will cause us more pain with python3

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