diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2011-05-03 14:06:26 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2011-05-03 14:06:26 -0500 |
| commit | 136d7397a067d815d986b49e06d6d3217fdb18f8 (patch) | |
| tree | 2decb82d93bdd67365162ddfcbb472caffdbbd06 /src/lib/Server/Admin/Xcmd.py | |
| parent | 20ed074b7a05b8b3817b1ca9a11d8a4b09b719ce (diff) | |
| parent | 71a026b3b7c13fdf242d387b255d6e0daefce0ca (diff) | |
| download | bcfg2-136d7397a067d815d986b49e06d6d3217fdb18f8.tar.gz bcfg2-136d7397a067d815d986b49e06d6d3217fdb18f8.tar.bz2 bcfg2-136d7397a067d815d986b49e06d6d3217fdb18f8.zip | |
Merge branch 'py3k'
Diffstat (limited to 'src/lib/Server/Admin/Xcmd.py')
| -rw-r--r-- | src/lib/Server/Admin/Xcmd.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/Server/Admin/Xcmd.py b/src/lib/Server/Admin/Xcmd.py index e761a5e3d..fd5794f88 100644 --- a/src/lib/Server/Admin/Xcmd.py +++ b/src/lib/Server/Admin/Xcmd.py @@ -1,10 +1,12 @@ import sys -import xmlrpclib import Bcfg2.Options import Bcfg2.Proxy import Bcfg2.Server.Admin +# Compatibility import +from Bcfg2.Bcfg2Py3k import xmlrpclib + class Xcmd(Bcfg2.Server.Admin.Mode): __shorthelp__ = ("XML-RPC Command Interface") @@ -39,7 +41,8 @@ class Xcmd(Bcfg2.Server.Admin.Mode): args = tuple(setup['args'][1:]) try: data = getattr(proxy, cmd)(*args) - except xmlrpclib.Fault, flt: + except xmlrpclib.Fault: + flt = sys.exc_info()[1] if flt.faultCode == 7: print("Unknown method %s" % cmd) return |