Fix bad indentation in certs and func dirs

4 files changed, 20 insertions, 20 deletions

diff --git a/func/certmaster.py b/func/certmaster.py
index e836889..e881b3e 100755
--- a/func/certmaster.py
+++ b/func/certmaster.py
@@ -173,7 +173,7 @@ class CertMaster(object):
             try:
                 csrreq = crypto.load_certificate_request(crypto.FILETYPE_PEM, csr_buf)                
             except crypto.Error, e:
-               print 'Bad CSR: %s' % csr
+                print 'Bad CSR: %s' % csr
                 
         else: # assume we got a bare csr req
             csrreq = csr
@@ -193,20 +193,20 @@ class CertMaster(object):
 
 class CertmasterXMLRPCServer(SimpleXMLRPCServer.SimpleXMLRPCServer):
     def __init__(self, args):
-       self.allow_reuse_address = True
-       SimpleXMLRPCServer.SimpleXMLRPCServer.__init__(self, args)
+        self.allow_reuse_address = True
+        SimpleXMLRPCServer.SimpleXMLRPCServer.__init__(self, args)
         
 
 def serve(xmlrpcinstance):
 
-     """
-     Code for starting the XMLRPC service. 
-     """
+    """
+    Code for starting the XMLRPC service.
+    """
 
-     server = CertmasterXMLRPCServer((xmlrpcinstance.cfg.listen_addr, xmlrpcinstance.cfg.listen_port))
-     server.logRequests = 0 # don't print stuff to console
-     server.register_instance(xmlrpcinstance)
-     server.serve_forever()
+    server = CertmasterXMLRPCServer((xmlrpcinstance.cfg.listen_addr, xmlrpcinstance.cfg.listen_port))
+    server.logRequests = 0 # don't print stuff to console
+    server.register_instance(xmlrpcinstance)
+    server.serve_forever()
 
 
 def main(argv):
diff --git a/func/codes.py b/func/codes.py
index c549709..058ca44 100755
--- a/func/codes.py
+++ b/func/codes.py
@@ -17,9 +17,9 @@ import exceptions
 
 
 class FuncException(exceptions.Exception):
-   pass
+    pass
 
 class InvalidMethodException(FuncException):
-   pass
+    pass
 
 # FIXME: more sub-exceptions maybe
diff --git a/func/logger.py b/func/logger.py
index cdfa899..94df311 100755
--- a/func/logger.py
+++ b/func/logger.py
@@ -59,7 +59,7 @@ class AuditLogger(Singleton):
         self.loglevel = logging.INFO
         self._setup_logging()
         if self._no_handlers:
-             self._setup_handlers(logfilepath=logfilepath)
+            self._setup_handlers(logfilepath=logfilepath)
 
     def log_call(self, ip, CN, cert_hash, method, params):
         # square away a good parseable format at some point -akl
diff --git a/func/utils.py b/func/utils.py
index 724c847..8d9d383 100755
--- a/func/utils.py
+++ b/func/utils.py
@@ -21,9 +21,9 @@ import traceback
 # but we really need to fix out server side logging and error
 # reporting so we don't need it
 def trace_me():
-   x = traceback.extract_stack()
-   bar = string.join(traceback.format_list(x))
-   return bar
+    x = traceback.extract_stack()
+    bar = string.join(traceback.format_list(x))
+    return bar
 
 
 def daemonize(pidfile=None):
@@ -35,13 +35,13 @@ def daemonize(pidfile=None):
     print pidfile
     pid = os.fork()
     if pid > 0:
-       sys.exit(0)
+        sys.exit(0)
     os.setsid()
     os.umask(0)
     pid = os.fork()
 
 
     if pid > 0:
-       if pidfile is not None:
-          open(pidfile, "w").write(str(pid))
-       sys.exit(0)
+        if pidfile is not None:
+            open(pidfile, "w").write(str(pid))
+        sys.exit(0)