backend/common/rhn_mpm.py | 2 +-
backend/server/handlers/applet/applet.py | 2 +-
backend/server/handlers/xmlrpc/queue.py | 2 +-
backend/server/rhnChannel.py | 2 +-
backend/server/rhnServer/server_certificate.py | 2 +-
client/rhel/rhnlib/rhn/__init__.py | 7 +------
client/rhel/rhnlib/rhnlib.spec | 6 +++++-
client/rhel/rhnlib/test/14-Input-Output.py | 3 ++-
rel-eng/packages/rhnlib | 2 +-
9 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit c8f03c3545dfc24b74ae9580c27a9af36c53b946
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jul 27 16:07:34 2011 +0200
Automatic commit of package [rhnlib] release [2.5.42-1].
diff --git a/client/rhel/rhnlib/rhnlib.spec b/client/rhel/rhnlib/rhnlib.spec
index 8813b84..9a6b750 100644
--- a/client/rhel/rhnlib/rhnlib.spec
+++ b/client/rhel/rhnlib/rhnlib.spec
@@ -4,7 +4,7 @@ Summary: Python libraries for the RHN project
Name: rhnlib
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 2.5.41
+Version: 2.5.42
Release: 1%{?dist}
Group: Development/Libraries
@@ -61,6 +61,10 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitelib}/*
%changelog
+* Wed Jul 27 2011 Michael Mraka <michael.mraka(a)redhat.com> 2.5.42-1
+- import xmlrpclib directly
+- removed unnecessary implicit imports
+
* Fri May 20 2011 Michael Mraka <michael.mraka(a)redhat.com> 2.5.41-1
- merged backend/common/UserDictCase.py into rhnlib/rhn/UserDictCase.py
diff --git a/rel-eng/packages/rhnlib b/rel-eng/packages/rhnlib
index 2fda6aa..97d571c 100644
--- a/rel-eng/packages/rhnlib
+++ b/rel-eng/packages/rhnlib
@@ -1 +1 @@
-2.5.41-1 client/rhel/rhnlib/
+2.5.42-1 client/rhel/rhnlib/
commit de4e692e52fd82c40f30aeeddab4ec86425e3700
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jul 27 15:59:29 2011 +0200
import xmlrpclib directly
it's been removed from rhn/__init__.py
diff --git a/backend/common/rhn_mpm.py b/backend/common/rhn_mpm.py
index 19bd783..e2ef742 100644
--- a/backend/common/rhn_mpm.py
+++ b/backend/common/rhn_mpm.py
@@ -17,7 +17,7 @@ import os
import gzip
import cStringIO
import tempfile
-from rhn.rpclib import xmlrpclib
+import xmlrpclib
import struct
diff --git a/backend/server/handlers/applet/applet.py
b/backend/server/handlers/applet/applet.py
index d7a8453..e7d1e7e 100644
--- a/backend/server/handlers/applet/applet.py
+++ b/backend/server/handlers/applet/applet.py
@@ -15,7 +15,7 @@
# system module imports
import string
-from rhn.rpclib import xmlrpclib
+import xmlrpclib
import random
# common modules imports
diff --git a/backend/server/handlers/xmlrpc/queue.py
b/backend/server/handlers/xmlrpc/queue.py
index e47f165..c28f011 100644
--- a/backend/server/handlers/xmlrpc/queue.py
+++ b/backend/server/handlers/xmlrpc/queue.py
@@ -16,7 +16,7 @@
import sys
import time
-from rhn.rpclib import xmlrpclib
+import xmlrpclib
from types import IntType, TupleType
diff --git a/backend/server/rhnChannel.py b/backend/server/rhnChannel.py
index b3db511..d660731 100644
--- a/backend/server/rhnChannel.py
+++ b/backend/server/rhnChannel.py
@@ -17,7 +17,7 @@
import time
import string
import rpm
-from rhn.rpclib import xmlrpclib
+import xmlrpclib
from types import IntType, ListType, DictType
diff --git a/backend/server/rhnServer/server_certificate.py
b/backend/server/rhnServer/server_certificate.py
index 5f2e59a..391fe39 100644
--- a/backend/server/rhnServer/server_certificate.py
+++ b/backend/server/rhnServer/server_certificate.py
@@ -23,7 +23,7 @@ import time
import random
import socket
import string
-from rhn.rpclib import xmlrpclib
+import xmlrpclib
from spacewalk.common.rhnLog import log_debug, log_error
from spacewalk.common.rhnException import rhnFault
diff --git a/client/rhel/rhnlib/test/14-Input-Output.py
b/client/rhel/rhnlib/test/14-Input-Output.py
index a75cecd..454fad4 100644
--- a/client/rhel/rhnlib/test/14-Input-Output.py
+++ b/client/rhel/rhnlib/test/14-Input-Output.py
@@ -9,7 +9,8 @@
import string
import sys
sys.path.append('..')
-from rhn import transports, xmlrpclib
+from rhn import transports
+import xmlrpclib
from cStringIO import StringIO
REFERENCE_XML = {
commit dfde40630a2fbf1933a09c4228824a3da1287446
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jul 27 15:55:44 2011 +0200
removed unnecessary implicit imports
fixing
python: Modules/gcmodule.c:275: visit_decref: Assertion `gc-> gc.gc_refs != 0'
failed.
Aborted (core dumped)
diff --git a/client/rhel/rhnlib/rhn/__init__.py b/client/rhel/rhnlib/rhn/__init__.py
index f0bedd8..e390404 100644
--- a/client/rhel/rhnlib/rhn/__init__.py
+++ b/client/rhel/rhnlib/rhn/__init__.py
@@ -1,14 +1,9 @@
#
# __init__.py
#
-# Copyright (c) 2005 Red Hat, Inc.
+# Copyright (c) 2011 Red Hat, Inc.
#
-# $Id$
"""
rhn - A collection of modules used by Red Hat Network
"""
-import rpclib
-import xmlrpclib
-
-__all__ = ["rpclib", "xmlrpclib"]