proxy/proxy/apacheHandler.py | 8 ++++++--
proxy/proxy/apacheServer.py | 6 ++++--
proxy/proxy/broker/rhnBroker.py | 6 ++++--
proxy/proxy/broker/rhnRepository.py | 5 ++++-
proxy/proxy/pm/rhn_package_manager.py | 2 +-
proxy/proxy/redirect/rhnRedirect.py | 7 +++++--
proxy/proxy/rhnAuthCacheClient.py | 6 ++++--
proxy/proxy/rhnProxyAuth.py | 7 +++++--
proxy/proxy/rhnShared.py | 7 +++++--
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
11 files changed, 43 insertions(+), 18 deletions(-)
New commits:
commit a12e6c81c6ccac8c7a336cd6c780435bf7583869
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 4 17:25:16 2011 +0200
Automatic commit of package [spacewalk-proxy] release [1.5.3-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 82c89e9..b969419 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -4,7 +4,7 @@ Group: Applications/Internet
License: GPLv2
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.5.2
+Version: 1.5.3
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -331,6 +331,9 @@ fi
%changelog
+* Wed May 04 2011 Miroslav Suchý 1.5.3-1
+- do not import modules through magic
+
* Tue Apr 19 2011 Miroslav Suchý <msuchy(a)redhat.com> 1.5.2-1
- 697447 - handle all other request
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index e3a46c2..eb19afc 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-1.5.2-1 proxy/proxy/
+1.5.3-1 proxy/proxy/
commit de868e9f42ebd3d40ad5a7bd034c9192ce1719ac
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 4 17:18:57 2011 +0200
do not import modules through magic
diff --git a/proxy/proxy/apacheHandler.py b/proxy/proxy/apacheHandler.py
index 2828c60..4c358c2 100644
--- a/proxy/proxy/apacheHandler.py
+++ b/proxy/proxy/apacheHandler.py
@@ -26,8 +26,12 @@ from rhnConstants import *
from rhn import rpclib, connections
## common imports
-from spacewalk.common import rhnApache, rhnFlags, log_debug, log_error, CFG, \
- UserDictCase, Traceback, rhnFault, rhnException, apache
+from spacewalk.common.rhnConfig import CFG
+from spacewalk.common.rhnLog import initLOG, log_debug, log_error
+from spacewalk.common.rhnApache import rhnApache
+from spacewalk.common.rhnTB import Traceback
+from spacewalk.common.rhnException import rhnFault, rhnException
+from spacewalk.common import rhnFlags, UserDictCase, apache
from spacewalk.common.rhnLib import setHeaderValue
## local imports
diff --git a/proxy/proxy/apacheServer.py b/proxy/proxy/apacheServer.py
index e898612..1fb20e2 100644
--- a/proxy/proxy/apacheServer.py
+++ b/proxy/proxy/apacheServer.py
@@ -17,8 +17,10 @@
# $Id: apacheServer.py,v 1.81 2005/07/05 17:39:03 wregglej Exp $
# common module imports
-from spacewalk.common import CFG, initCFG, initLOG, log_setreq, Traceback, \
- log_debug, apache
+from spacewalk.common.rhnConfig import CFG, initCFG
+from spacewalk.common.rhnLog import initLOG, log_setreq, log_debug
+from spacewalk.common.rhnTB import Traceback
+from spacewalk.common import apache
class HandlerWrap:
""" Wrapper handlers to catch unwanted exceptions """
diff --git a/proxy/proxy/broker/rhnBroker.py b/proxy/proxy/broker/rhnBroker.py
index aa6dae3..2849668 100644
--- a/proxy/proxy/broker/rhnBroker.py
+++ b/proxy/proxy/broker/rhnBroker.py
@@ -23,8 +23,10 @@ import re
# common module imports
from spacewalk.common.rhnLib import parseUrl
-from spacewalk.common import UserDictCase, rhnFlags, log_debug, log_error, CFG, \
- rhnFault, apache
+from spacewalk.common.rhnConfig import CFG
+from spacewalk.common.rhnLog import log_debug, log_error
+from spacewalk.common.rhnException import rhnFault
+from spacewalk.common import UserDictCase, rhnFlags, apache
from spacewalk.common.rhnTranslate import _
# local module imports
diff --git a/proxy/proxy/broker/rhnRepository.py b/proxy/proxy/broker/rhnRepository.py
index e50b6d4..928b377 100644
--- a/proxy/proxy/broker/rhnRepository.py
+++ b/proxy/proxy/broker/rhnRepository.py
@@ -30,7 +30,10 @@ from operator import truth
import xmlrpclib
## common imports
-from spacewalk.common import rhnRepository, log_debug, log_error, CFG, rhnFault
+from spacewalk.common.rhnLog import log_debug, log_error
+from spacewalk.common.rhnException import rhnFault
+from spacewalk.common.rhnConfig import CFG
+from spacewalk.common import rhnRepository
from spacewalk.common.rhnTranslate import _
## local imports
diff --git a/proxy/proxy/pm/rhn_package_manager.py
b/proxy/proxy/pm/rhn_package_manager.py
index 8ed90f7..7466156 100755
--- a/proxy/proxy/pm/rhn_package_manager.py
+++ b/proxy/proxy/pm/rhn_package_manager.py
@@ -44,7 +44,7 @@ except ImportError:
from optik import Option, OptionParser
# RHN imports
-from spacewalk.common import CFG, initCFG
+from spacewalk.common.rhnConfig import CFG, initCFG
from spacewalk.common.rhnLib import parseUrl
initCFG('proxy.package_manager')
diff --git a/proxy/proxy/redirect/rhnRedirect.py b/proxy/proxy/redirect/rhnRedirect.py
index 8e08229..b5f8abe 100644
--- a/proxy/proxy/redirect/rhnRedirect.py
+++ b/proxy/proxy/redirect/rhnRedirect.py
@@ -21,8 +21,11 @@ import socket
import re
# common module imports
-from spacewalk.common import log_debug, log_error, CFG, rhnFlags, rhnFault, rhnLib, \
- Traceback, apache
+from spacewalk.common.rhnConfig import CFG
+from spacewalk.common.rhnLog import log_debug, log_error
+from spacewalk.common.rhnException import rhnFault
+from spacewalk.common.rhnTB import Traceback
+from spacewalk.common import rhnFlags, rhnLib, apache
from spacewalk.common.rhnTranslate import _
# local module imports
diff --git a/proxy/proxy/rhnAuthCacheClient.py b/proxy/proxy/rhnAuthCacheClient.py
index 23b16c9..833b087 100644
--- a/proxy/proxy/rhnAuthCacheClient.py
+++ b/proxy/proxy/rhnAuthCacheClient.py
@@ -23,7 +23,9 @@
import socket
## local imports
-from spacewalk.common import log_debug, log_error, Traceback, rhnFault
+from spacewalk.common.rhnLog import log_debug, log_error
+from spacewalk.common.rhnTB import Traceback
+from spacewalk.common.rhnException import rhnFault
from spacewalk.common.rhnTranslate import _
from rhnAuthProtocol import CommunicationError, send, recv
from xmlrpclib import Fault
@@ -171,7 +173,7 @@ class Shelf:
#-------------------------------------------------------------------------------
# test code
if __name__ == '__main__':
- from spacewalk.common import initCFG
+ from spacewalk.common.rhnConfig import initCFG
initCFG("proxy.broker")
s = Shelf(('localhost', 9999))
s['1234'] = [1, 2, 3, 4, None, None]
diff --git a/proxy/proxy/rhnProxyAuth.py b/proxy/proxy/rhnProxyAuth.py
index b791185..bb8c988 100644
--- a/proxy/proxy/rhnProxyAuth.py
+++ b/proxy/proxy/rhnProxyAuth.py
@@ -30,8 +30,11 @@ from rhn import SSL
## common imports
from spacewalk.common.rhnLib import parseUrl
-from spacewalk.common import Traceback, log_debug, log_error, CFG, \
- rhnCache, rhnFault
+from spacewalk.common.rhnTB import Traceback
+from spacewalk.common.rhnLog import log_debug, log_error
+from spacewalk.common.rhnConfig import CFG
+from spacewalk.common.rhnException import rhnFault
+from spacewalk.common import rhnCache
from spacewalk.common.rhnTranslate import _
diff --git a/proxy/proxy/rhnShared.py b/proxy/proxy/rhnShared.py
index d11134e..84131ef 100644
--- a/proxy/proxy/rhnShared.py
+++ b/proxy/proxy/rhnShared.py
@@ -26,8 +26,11 @@ from rhn import connections
from rhn.SSL import TimeoutException
## common imports
-from spacewalk.common import UserDictCase, rhnFlags, log_debug, log_error, \
- Traceback, CFG, rhnException, rhnFault, rhnLib, apache
+from spacewalk.common.rhnTB import Traceback
+from spacewalk.common.rhnConfig import CFG
+from spacewalk.common.rhnException import rhnFault, rhnException
+from spacewalk.common.rhnLog import log_debug, log_error
+from spacewalk.common import UserDictCase, rhnFlags, rhnLib, apache
from spacewalk.common.rhnTranslate import _
## local imports