backend/common/rhnRepository.py | 4 ++--
backend/satellite_tools/connection.py | 2 +-
backend/satellite_tools/rhn_satellite_activate.py | 7 ++++---
backend/satellite_tools/satsync.py | 4 ++--
backend/satellite_tools/xmlDiskDumper.py | 6 +++---
backend/satellite_tools/xmlWireSource.py | 14 +++++++-------
backend/server/apacheRequest.py | 18 +++++++++---------
backend/server/handlers/xmlrpc/up2date.py | 6 +++---
backend/server/rhnRepository.py | 2 +-
9 files changed, 32 insertions(+), 31 deletions(-)
New commits:
commit 2a12424b4c4160e506f8dc78d4652f59c359effb
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Dec 3 10:36:45 2010 +0100
direct Fault, ResponseError and ProtocolError import has been removed from rpclib
diff --git a/backend/satellite_tools/rhn_satellite_activate.py
b/backend/satellite_tools/rhn_satellite_activate.py
index 82e24fb..96c6222 100644
--- a/backend/satellite_tools/rhn_satellite_activate.py
+++ b/backend/satellite_tools/rhn_satellite_activate.py
@@ -79,7 +79,8 @@ def openGzippedFile(filename):
def getXmlrpcServer(server, handler, proxy, proxyUser, proxyPass,
sslCertPath, sslYN=1):
""" Return an XML-RPC Server connection object; no ssl if
sslCertPath==None.
- May return rpclib.Fault, rpclib.ProtocolError, or socket.error.
+ May return rpclib.xmlrpclib.Fault, rpclib.xmlrpclib.ProtocolError,
+ or socket.error.
"""
_uri = server + handler
@@ -287,7 +288,7 @@ def activateSatellite_remote(options):
if options.verbose:
print "Executing: remote XMLRPC deactivation (if necessary)."
ret = s.satellite.deactivate_satellite(systemid, rhn_cert)
- except rpclib.Fault, f:
+ except rpclib.xmlrpclib.Fault, f:
# 1025 results in "satellite_not_activated"
if abs(f.faultCode) != 1025:
sys.stderr.write('ERROR: unhandled XMLRPC fault upon '
@@ -303,7 +304,7 @@ def activateSatellite_remote(options):
if options.verbose:
print "Executing: remote XMLRPC activation call."
ret = s.satellite.activate_satellite(systemid, rhn_cert)
- except rpclib.Fault, f:
+ except rpclib.xmlrpclib.Fault, f:
sys.stderr.write("Error reported from RHN: %s\n" % f)
# NOTE: we support the old (pre-cactus) web-handler API and the new.
# The old web handler used faultCodes of 1|-1 and the new API uses
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index 63a6f60..f825ca3 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -189,7 +189,7 @@ class Runner:
self.syncer.initialize()
except (KeyboardInterrupt, SystemExit):
raise
- except xmlWireSource.rpclib.Fault, e:
+ except xmlWireSource.rpclib.xmlrpclib.Fault, e:
if CFG.ISS_PARENT:
# we met old satellite who do not know ISS
log(-1, ['', messages.iss_not_available ], )
@@ -279,7 +279,7 @@ class Runner:
return 1
except (KeyboardInterrupt, SystemExit):
raise
- except xmlWireSource.rpclib.Fault, e:
+ except xmlWireSource.rpclib.xmlrpclib.Fault, e:
log(-1, messages.failed_step % (step_name, e.faultString))
return 1
except Exception, e:
diff --git a/backend/satellite_tools/xmlDiskDumper.py
b/backend/satellite_tools/xmlDiskDumper.py
index 5b8bb6d..c757e53 100644
--- a/backend/satellite_tools/xmlDiskDumper.py
+++ b/backend/satellite_tools/xmlDiskDumper.py
@@ -122,7 +122,7 @@ class Dumper:
while 1:
try:
stream = self._getInputStream()
- except rpclib.ProtocolError:
+ except rpclib.xmlrpclib.ProtocolError:
if tries == 0:
# No more tries
raise
@@ -342,7 +342,7 @@ class BinaryRPMDumper(ShortPackageDumper):
filename = self._getFile()
try:
ShortPackageDumper.dump(self, force=force)
- except rpclib.Fault, e:
+ except rpclib.xmlrpclib.Fault, e:
if e.faultCode in (-3003, -3007):
# Missing file
print "Missing package", self._mixin.id
@@ -399,7 +399,7 @@ class KickstartFilesDumper(KickstartDataDumper):
self.compression = 0
try:
return Dumper.dump(self, force=force)
- except rpclib.Fault, e:
+ except rpclib.xmlrpclib.Fault, e:
if e.faultCode in (-3003, -3007):
# Missing file
print "Missing file", self._mixin.relative_path
diff --git a/backend/satellite_tools/xmlWireSource.py
b/backend/satellite_tools/xmlWireSource.py
index 3a829b8..b612c85 100644
--- a/backend/satellite_tools/xmlWireSource.py
+++ b/backend/satellite_tools/xmlWireSource.py
@@ -153,7 +153,7 @@ class BaseWireSource:
try:
stream = apply(func, params)
return stream
- except rpclib.ProtocolError, e:
+ except rpclib.xmlrpclib.ProtocolError, e:
p = tuple(['<the systemid>'] + list(params[1:]))
lastErrorMsg = 'ERROR: server.%s%s: %s' % (method, p, e)
log2(-1, 2, lastErrorMsg, stream=sys.stderr)
@@ -162,7 +162,7 @@ class BaseWireSource:
# do not reraise this exception!
except (KeyboardInterrupt, SystemExit):
raise
- except rpclib.Fault, e:
+ except rpclib.xmlrpclib.Fault, e:
lastErrorMsg = e.faultString
break
except Exception, e:
@@ -292,7 +292,7 @@ class XMLRPCWireSource(BaseWireSource):
except TypeError, e:
log(-1, 'ERROR: during "apply(getattr(BaseWireSource.serverObj, %s),
%s)"' % (function, params))
raise
- except rpclib.ProtocolError, e:
+ except rpclib.xmlrpclib.ProtocolError, e:
log2(-1, 2, 'ERROR: ProtocolError: %s' % e, stream=sys.stderr)
raise
return retval
@@ -308,7 +308,7 @@ class AuthWireSource(XMLRPCWireSource):
log(2, ' +++ Satellite synchronization tool checking in.')
try:
authYN = self._xmlrpc('authentication.check', (self.systemid,))
- except (rpclib.ProtocolError, rpclib.Fault), e:
+ except (rpclib.xmlrpclib.ProtocolError, rpclib.xmlrpclib.Fault), e:
# bug 141197: the logging of all exceptions is handled higher up in
# the call stack
# log2(-1, 1, ' ERROR: %s' % e, stream=sys.stderr)
@@ -333,7 +333,7 @@ class CertWireSource(XMLRPCWireSource):
#log(2, ' +++ Satellite synchronization tool downloading
certificate.')
try:
cert = self._xmlrpc("certificate.download", (self.systemid, ))
- except rpclib.Fault, e:
+ except rpclib.xmlrpclib.Fault, e:
log(-1, ' --- Unable to download the satellite certificate')
log(-1, ' ERROR: %s' % e, stream=sys.stderr)
sys.exit(-1)
@@ -382,7 +382,7 @@ class RPCGetWireSource(BaseWireSource):
try:
login_token = self.getServer().authentication.login(self.systemid)
- except rpclib.ProtocolError, e:
+ except rpclib.xmlrpclib.ProtocolError, e:
log2(-1, 2, 'ERROR: ProtocolError: %s' % e, stream=sys.stderr)
raise
return login_token
@@ -400,7 +400,7 @@ class RPCGetWireSource(BaseWireSource):
for i in range(cfg['networkRetries']):
try:
ret = apply(getattr(get_server_obj, function_name), params)
- except rpclib.ProtocolError, e:
+ except rpclib.xmlrpclib.ProtocolError, e:
# We have two codes to check: the HTTP error code, and the
# combination (failtCode, faultString) encoded in the headers
# of the request.
diff --git a/backend/server/apacheRequest.py b/backend/server/apacheRequest.py
index c622c6c..8888ddf 100644
--- a/backend/server/apacheRequest.py
+++ b/backend/server/apacheRequest.py
@@ -99,7 +99,7 @@ class apacheRequest:
msg = open(CFG.MESSAGE_TO_ALL).read()
log_debug(3, "Sending message to all clients: %s" % msg)
# Send the message as a fault.
- response = rpclib.Fault(
+ response = rpclib.xmlrpclib.Fault(
-1, _("IMPORTANT MESSAGE FOLLOWS:\n%s") % msg)
# and now send everything back
ret = self.response(response)
@@ -124,7 +124,7 @@ class apacheRequest:
if sys.exc_type == UnknownXML:
fault = -1
e_type, e_value = sys.exc_info()[:2]
- response = rpclib.Fault(fault, _(
+ response = rpclib.xmlrpclib.Fault(fault, _(
"While running '%s': caught\n%s : %s\n") % (
method, e_type, e_value))
Traceback(method, self.req,
@@ -186,7 +186,7 @@ class apacheRequest:
# convert a response to the right type for passing back to
# rpclib.xmlrpclib.dumps
def normalize(self, response):
- if isinstance(response, rpclib.Fault):
+ if isinstance(response, rpclib.xmlrpclib.Fault):
return response
return (response,)
@@ -307,7 +307,7 @@ class apacheRequest:
transfer=transports.lookupTransfer(self.input.transfer),
encoding=transports.lookupEncoding(self.input.encoding))
- if isinstance(response, rpclib.Fault):
+ if isinstance(response, rpclib.xmlrpclib.Fault):
log_debug(4, "Return FAULT",
response.faultCode, response.faultString)
# No compression for faults because we'd like them to pop
@@ -387,7 +387,7 @@ class apachePOST(apacheRequest):
self.parser.feed(data)
except IndexError:
# malformed XML data
- raise rpclib.ResponseError
+ raise rpclib.xmlrpclib.ResponseError
self.parser.close()
# extract the method and arguments; we pass the exceptions through
@@ -461,7 +461,7 @@ class apachePOST(apacheRequest):
# Decode the request; avoid logging crappy responses
try:
params, method = self.decode(_body)
- except rpclib.ResponseError:
+ except rpclib.xmlrpclib.ResponseError:
log_error("Got bad XML-RPC blob of len = %d" % len(_body))
return apache.HTTP_BAD_REQUEST
else:
@@ -569,7 +569,7 @@ class GetHandler(apacheRequest):
# since we have to stick the error message in the HTTP header,
# and to return an Apache error code
- if isinstance(response, rpclib.Fault):
+ if isinstance(response, rpclib.xmlrpclib.Fault):
log_debug(4, "Return FAULT",
response.faultCode, response.faultString)
retcode = apache.HTTP_NOT_FOUND
commit 6fbdcc38769b67d905c1b4d93c9c45853321ff67
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Dec 3 10:36:45 2010 +0100
direct File import has been removed from rpclib
diff --git a/backend/common/rhnRepository.py b/backend/common/rhnRepository.py
index 4ca1bad..6e5cda4 100644
--- a/backend/common/rhnRepository.py
+++ b/backend/common/rhnRepository.py
@@ -143,7 +143,7 @@ class Repository(RPC_Base):
data = self._getHeaderFromFile(filePath)
# XXX: Interesting. Found that if returned just data, this
# function works fine. Investigate later.
- return rpclib.File(cStringIO.StringIO(data), len(data))
+ return rpclib.transports.File(cStringIO.StringIO(data), len(data))
# The real workhorse for all flavors of listall
# It tries to pull data out of a file; if it doesn't work,
@@ -163,7 +163,7 @@ class Repository(RPC_Base):
length = features['length']
lastModified = features['lastModified']
self._set_last_modified(lastModified)
- return rpclib.File(open(filePath, "rb"), length, name=filePath)
+ return rpclib.transports.File(open(filePath, "rb"), length,
name=filePath)
def _getHeaderFromFile(self, filePath, stat_info=None):
""" Utility function to extract a header from an rpm.
diff --git a/backend/satellite_tools/connection.py
b/backend/satellite_tools/connection.py
index 9be0a64..b7b1ebb 100644
--- a/backend/satellite_tools/connection.py
+++ b/backend/satellite_tools/connection.py
@@ -56,7 +56,7 @@ class Transport(rpclib.transports.Transport):
# XXX application/octet-stream should go away
if content_type in ('application/xml',
'application/octet-stream',
'application/x-rpm'):
- f = rpclib.File(fd)
+ f = rpclib.transports.File(fd)
# Explanation copied from the base class' method (rhn.transports):
# Set the File's close method to the connection's
# Note that calling the HTTPResponse's close() is not enough,
diff --git a/backend/server/apacheRequest.py b/backend/server/apacheRequest.py
index 30679bf..c622c6c 100644
--- a/backend/server/apacheRequest.py
+++ b/backend/server/apacheRequest.py
@@ -240,7 +240,7 @@ class apacheRequest:
self.req.headers_out["Content-Length"] = str(response_size)
# if we loaded this from a real fd, set it as the X-Replace-Content
- # check for "name" since sometimes we get xmlrpclib.File's that
have
+ # check for "name" since sometimes we get
xmlrpclib.transports.File's that have
# a stringIO as the file_obj, and they dont have a .name (ie,
# fileLists...)
if response.name:
@@ -290,7 +290,7 @@ class apacheRequest:
compress_response = rhnFlags.test("compress_response")
# Init an output object; we'll use it for sending data in various
# formats
- if isinstance(response, rpclib.File):
+ if isinstance(response, rpclib.transports.File):
if not hasattr(response.file_obj, 'fileno') and compress_response:
# This is a StringIO that has to be compressed, so read it in
# memory; mark that we don't have to do any xmlrpc encoding
diff --git a/backend/server/handlers/xmlrpc/up2date.py
b/backend/server/handlers/xmlrpc/up2date.py
index b34fc15..efe7fca 100644
--- a/backend/server/handlers/xmlrpc/up2date.py
+++ b/backend/server/handlers/xmlrpc/up2date.py
@@ -287,7 +287,7 @@ class Up2date(rhnHandler):
filePath = rhnPackage.get_package_path_compat_arches(self.server_id,
package, server.archname)
- return rpclib.File(open(filePath, "r"), name=filePath)
+ return rpclib.transports.File(open(filePath, "r"), name=filePath)
def source_package(self, system_id, package):
@@ -309,7 +309,7 @@ class Up2date(rhnHandler):
filePath = rhnPackage.get_source_package_path_by_nvre(self.server_id,
package)
- return rpclib.File(open(filePath, "r"), name=filePath)
+ return rpclib.transports.File(open(filePath, "r"), name=filePath)
def source_package_by_name(self, system_id, filename):
@@ -329,7 +329,7 @@ class Up2date(rhnHandler):
filePath = rhnPackage.get_source_package_path_by_name(self.server_id,
filename)
- return rpclib.File(open(filePath, "r"), name=filePath)
+ return rpclib.transports.File(open(filePath, "r"), name=filePath)
def solvedep(self, system_id, deps):
diff --git a/backend/server/rhnRepository.py b/backend/server/rhnRepository.py
index 5162784..09f2cf0 100644
--- a/backend/server/rhnRepository.py
+++ b/backend/server/rhnRepository.py
@@ -195,7 +195,7 @@ class Repository(rhnRepository.Repository):
log_debug(2, "Unknown repomd file requested: %s" % file_name)
raise rhnFault(6)
- output = rpclib.File(output, name=file_name)
+ output = rpclib.transports.File(output, name=file_name)
rhnFlags.set('Content-Type', content_type)