Deleted more unused shebangs.
--
"An organisation that treats its programmers as morons will soon have
programmers that are willing and able to act like morons only."
-Bjarne Stroustrup
From b90f49d4a9cea6b02fb739f8e3afe92dc7fd1731 Mon Sep 17 00:00:00 2001
From: Steve 'Ashcrow' Milner <stevem@xxxxxxxxxxxx>
Date: Sun, 13 Jan 2008 14:58:34 -0500
Subject: [PATCH] more deletions of shebangs.
---
func/SSLConnection.py | 4 +---
func/certmaster.py | 2 --
func/minion/server.py | 9 +++------
func/overlord/client.py | 10 +++-------
func/overlord/cmd_modules/call.py | 2 --
func/overlord/cmd_modules/copyfile.py | 3 ---
func/overlord/cmd_modules/listminions.py | 2 --
7 files changed, 7 insertions(+), 25 deletions(-)
diff --git a/func/SSLConnection.py b/func/SSLConnection.py
index 525489d..98ed8a0 100644
--- a/func/SSLConnection.py
+++ b/func/SSLConnection.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-#
# Higher-level SSL objects used by rpclib
#
# Copyright (c) 2002 Red Hat, Inc.
@@ -152,6 +150,7 @@ class SSLConnection:
raise e
return None
+
class PlgFileObject(socket._fileobject):
def close(self):
"""
@@ -164,4 +163,3 @@ class PlgFileObject(socket._fileobject):
self._sock.close()
finally:
self._sock = None
-
diff --git a/func/certmaster.py b/func/certmaster.py
index e8c046d..fa72493 100755
--- a/func/certmaster.py
+++ b/func/certmaster.py
@@ -225,8 +225,6 @@ def main(argv):
serve(cm)
-
if __name__ == "__main__":
#textdomain(I18N_DOMAIN)
main(sys.argv)
-
diff --git a/func/minion/server.py b/func/minion/server.py
index ef9e112..cd353b9 100755
--- a/func/minion/server.py
+++ b/func/minion/server.py
@@ -1,5 +1,4 @@
#!/usr/bin/python
-
"""
func
@@ -54,7 +53,7 @@ class XmlRpcInterface(object):
self.__setup_handlers()
# need a reference so we can log ip's, certs, etc
-# self.server = server
+ # self.server = server
def __setup_handlers(self):
@@ -101,8 +100,6 @@ class XmlRpcInterface(object):
raise codes.InvalidMethodException
-
-
class FuncApiMethod:
"""
@@ -144,7 +141,6 @@ class FuncApiMethod:
return rc
-
def serve():
"""
@@ -243,6 +239,7 @@ class FuncSSLXMLRPCServer(AuthedXMLRPCServer.AuthedSSLXMLRPCServer,
return False
+
def main(argv):
"""
@@ -261,8 +258,8 @@ def main(argv):
print >> sys.stderr, 'error: %s' % e
sys.exit(1)
-# ======================================================================================
+# ======================================================================================
if __name__ == "__main__":
textdomain(I18N_DOMAIN)
main(sys.argv)
diff --git a/func/overlord/client.py b/func/overlord/client.py
index c6d8ab6..4c29c63 100755
--- a/func/overlord/client.py
+++ b/func/overlord/client.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-
##
## func command line interface & client lib
##
@@ -62,10 +60,8 @@ class CommandAutomagic(object):
method = ".".join(self.base[1:])
return self.clientref.run(module,method,args,nforks=self.nforks)
-# ===================================
-
-
+# ===================================
# this is a module level def so we can use it and isServer() from
# other modules with a Client class
def expand_servers(spec, port=51234, noglobs=None, verbose=None, just_fqdns=False):
@@ -104,6 +100,7 @@ def expand_servers(spec, port=51234, noglobs=None, verbose=None, just_fqdns=Fals
return all_urls
+
# does the hostnamegoo actually expand to anything?
def isServer(server_string):
servers = expand_servers(server_string)
@@ -111,6 +108,7 @@ def isServer(server_string):
return True
return False
+
class Client(object):
def __init__(self, server_spec, port=DEFAULT_PORT, interactive=False,
@@ -260,5 +258,3 @@ class Client(object):
if x > max:
max = x
return max
-
-
diff --git a/func/overlord/cmd_modules/call.py b/func/overlord/cmd_modules/call.py
index b62131f..4828981 100644
--- a/func/overlord/cmd_modules/call.py
+++ b/func/overlord/cmd_modules/call.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-
"""
call func method invoker
diff --git a/func/overlord/cmd_modules/copyfile.py b/func/overlord/cmd_modules/copyfile.py
index ff1f148..7950b7b 100644
--- a/func/overlord/cmd_modules/copyfile.py
+++ b/func/overlord/cmd_modules/copyfile.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-
"""
copyfile command line
@@ -73,4 +71,3 @@ class CopyFile(client.command.Command):
data = xmlrpclib.Binary(fb)
results = client_obj.run("copyfile", "copyfile", [self.options.remotepath, data,
mode, uid, gid])
-
diff --git a/func/overlord/cmd_modules/listminions.py b/func/overlord/cmd_modules/listminions.py
index 95f0bc9..b34efe4 100644
--- a/func/overlord/cmd_modules/listminions.py
+++ b/func/overlord/cmd_modules/listminions.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-
"""
copyfile command line
--
1.5.3.7
_______________________________________________
Func-list mailing list
Func-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/func-list
