diff options
| author | Seth Vidal <skvidal@fedoraproject.org> | 2007-09-26 22:52:30 -0400 |
|---|---|---|
| committer | Seth Vidal <skvidal@fedoraproject.org> | 2007-09-26 22:52:30 -0400 |
| commit | 035c6b129d43d90af6202542b931de38e6a7e86b (patch) | |
| tree | a701475e0555bab20378b57c6c9ff551e9cf3f8c /minion | |
| parent | acf93f862e1f1a6cc19e70d834c4f533006263b1 (diff) | |
| parent | 00179513a9585eeeaee12c644a35f14f8ecc3862 (diff) | |
| download | third_party-func-035c6b129d43d90af6202542b931de38e6a7e86b.tar.gz third_party-func-035c6b129d43d90af6202542b931de38e6a7e86b.tar.xz third_party-func-035c6b129d43d90af6202542b931de38e6a7e86b.zip | |
Merge branch 'master' of ssh://git.fedoraproject.org/git/hosted/func
* 'master' of ssh://git.fedoraproject.org/git/hosted/func:
Remove assorted unused imports
added changelog comment
removed Require: on yum-util
Diffstat (limited to 'minion')
| -rw-r--r-- | minion/AuthedXMLRPCServer.py | 5 | ||||
| -rwxr-xr-x | minion/server.py | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/minion/AuthedXMLRPCServer.py b/minion/AuthedXMLRPCServer.py index 490b57a..da6b18a 100644 --- a/minion/AuthedXMLRPCServer.py +++ b/minion/AuthedXMLRPCServer.py @@ -15,11 +15,8 @@ # Copyright 2005 Dan Williams <dcbw@redhat.com> and Red Hat, Inc. # Modifications by Seth Vidal - 2007 -import os, sys +import sys import socket -import time -import SocketServer -import xmlrpclib import SimpleXMLRPCServer from func import SSLCommon import OpenSSL diff --git a/minion/server.py b/minion/server.py index 994003b..03c4fa5 100755 --- a/minion/server.py +++ b/minion/server.py @@ -21,7 +21,7 @@ import sys import traceback import socket -from rhpl.translate import _, N_, textdomain, utf8 +from rhpl.translate import textdomain I18N_DOMAIN = "func" # our modules |