[Rpm-maint] [PATCH 04/15] Convert relative imports within rpm package to absolute imports

David Malcolm dmalcolm at redhat.com
Thu Oct 15 19:14:58 UTC 2009


---
 python/rpm/__init__.py    |    9 ++++-----
 python/rpm/transaction.py |    2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/python/rpm/__init__.py b/python/rpm/__init__.py
index 49a4c77..3cf59f7 100644
--- a/python/rpm/__init__.py
+++ b/python/rpm/__init__.py
@@ -6,10 +6,9 @@ This module enables you to manipulate rpms and the rpm database.
 
 import warnings
 import os
-from _rpm import *
-from transaction import *
-
-import _rpm
+from rpm._rpm import *
+from rpm.transaction import *
+import rpm._rpm as _rpm
 _RPMVSF_NODIGESTS = _rpm._RPMVSF_NODIGESTS
 _RPMVSF_NOHEADER = _rpm._RPMVSF_NOHEADER
 _RPMVSF_NOPAYLOAD = _rpm._RPMVSF_NOPAYLOAD
@@ -17,7 +16,7 @@ _RPMVSF_NOSIGNATURES = _rpm._RPMVSF_NOSIGNATURES
 
 # try to import build bits but dont require it
 try:
-    from _rpmb import *
+    from rpm._rpmb import *
 except ImportError:
     pass
 
diff --git a/python/rpm/transaction.py b/python/rpm/transaction.py
index 8c7fb1f..6f57597 100644
--- a/python/rpm/transaction.py
+++ b/python/rpm/transaction.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 import rpm
-from _rpm import ts as _rpmts
+from rpm._rpm import ts as _rpmts
 
 # TODO: migrate relevant documentation from C-side
 class TransactionSet(_rpmts):
-- 
1.6.2.5



More information about the Rpm-maint mailing list