rewrite to python3
This commit is contained in:
@@ -1,179 +1,156 @@
|
||||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
# encoding: utf-8
|
||||
# $Id$
|
||||
# $URL$
|
||||
|
||||
"""
|
||||
Tools.py
|
||||
|
||||
Created by Marcus Stoegbauer on 2013-01-12.
|
||||
Copyright (c) 2013 __MyCompanyName__. All rights reserved.
|
||||
"""
|
||||
|
||||
import sys
|
||||
import os
|
||||
import cfgfile
|
||||
import Userconfig.cfgfile as cfgfile
|
||||
import re
|
||||
import time
|
||||
import shutil
|
||||
import itertools
|
||||
|
||||
|
||||
class Debug(object):
|
||||
verbose = 0
|
||||
|
||||
def __init__(self, verbose=0):
|
||||
self.setverbose(verbose)
|
||||
# def __init__
|
||||
|
||||
def setverbose(self, verbose):
|
||||
"""docstring for setverbose"""
|
||||
self.verbose = verbose
|
||||
# def setverbose
|
||||
|
||||
def addverbose(self):
|
||||
"""docstring for setverbose"""
|
||||
self.verbose += 1
|
||||
# def addverbose
|
||||
|
||||
def debug(self, out, level=0):
|
||||
"""docstring for debug"""
|
||||
if self.verbose >= level:
|
||||
print out
|
||||
# if level
|
||||
# def debug
|
||||
# class Debug
|
||||
verbose = 0
|
||||
|
||||
def __init__(self, verbose=0):
|
||||
self.setverbose(verbose)
|
||||
|
||||
def setverbose(self, verbose):
|
||||
"""docstring for setverbose"""
|
||||
self.verbose = verbose
|
||||
|
||||
def addverbose(self):
|
||||
"""docstring for setverbose"""
|
||||
self.verbose += 1
|
||||
|
||||
def debug(self, out, level=0):
|
||||
"""docstring for debug"""
|
||||
if self.verbose >= level:
|
||||
print(out)
|
||||
|
||||
|
||||
def error(out):
|
||||
"""Print error on stderr"""
|
||||
print >> sys.stderr, str(out)+"\n"
|
||||
# def error
|
||||
"""Print error on stderr"""
|
||||
print(str(out)+"\n", file=sys.stderr)
|
||||
|
||||
def getConfig(filename):
|
||||
"""reads filename as config, checks for DEST parameter and returns cfgfile object"""
|
||||
ret = None
|
||||
try:
|
||||
ret = cfgfile.Conf(filename)
|
||||
except:
|
||||
error("Error reading config file %s" % filename)
|
||||
return False
|
||||
# try
|
||||
|
||||
# check for DEST parameter
|
||||
if not ret.check("Main", "dest"):
|
||||
error("No DEST in config file %s" % filename)
|
||||
return False
|
||||
# if no DEST
|
||||
|
||||
# replace $HOME with real home directory
|
||||
if ret.get("Main", "dest") == "$HOME":
|
||||
ret.set("Main", "dest", os.environ['HOME'])
|
||||
# if $HOME
|
||||
|
||||
# make sure DEST ends with /
|
||||
if not ret.get("Main", "dest").endswith("/"):
|
||||
ret.set("Main", "dest", ret.get("Main", "dest")+"/")
|
||||
# if not /
|
||||
|
||||
return ret
|
||||
# def getConfig
|
||||
def get_config(filename):
|
||||
"""reads filename as config, checks for DEST parameter and returns cfgfile object"""
|
||||
ret = None
|
||||
try:
|
||||
ret = cfgfile.Conf(filename)
|
||||
except:
|
||||
error("Error reading config file %s" % filename)
|
||||
return False
|
||||
|
||||
# check for DEST parameter
|
||||
if not ret.check("Main", "dest"):
|
||||
error("No DEST in config file %s" % filename)
|
||||
return False
|
||||
|
||||
# replace $HOME with real home directory
|
||||
if ret.get("Main", "dest") == "$HOME":
|
||||
ret.set("Main", "dest", os.environ['HOME'])
|
||||
|
||||
# make sure DEST ends with /
|
||||
if not ret.get("Main", "dest").endswith("/"):
|
||||
ret.set("Main", "dest", ret.get("Main", "dest")+"/")
|
||||
|
||||
return ret
|
||||
|
||||
|
||||
def read_skip_comment(fp, commentstring):
|
||||
"""Read line from filehandle fp and skip all empty (whitespace) lines and lines starting with commentstring
|
||||
"""
|
||||
for line in fp:
|
||||
line = line[:-1]
|
||||
if (commentstring != "" and not re.match("^"+re.escape(commentstring), line)) and line !="" and not re.match("^\s+$", line):
|
||||
yield line
|
||||
# if not match
|
||||
# for line
|
||||
# def read_skip_comment
|
||||
"""Read line from filehandle fp and skip all empty (whitespace) lines and lines starting with commentstring
|
||||
"""
|
||||
for line in fp:
|
||||
line = line[:-1]
|
||||
if (commentstring != "" and not re.match("^"+re.escape(commentstring), line)) and line !="" and not re.match("^\s+$", line):
|
||||
yield line
|
||||
|
||||
|
||||
def diff(destfile, tempfile, commentstring, debug):
|
||||
"""diff destfile and tempfile, returns True if files differ, False if they are the same"""
|
||||
debug.debug("Diffing %s and %s" % (destfile, tempfile), 3)
|
||||
if not os.path.isfile(destfile):
|
||||
debug.debug("Destfile %s does not exist, returning True." % destfile, 3)
|
||||
# destfile does not exist -> copy tempfile over
|
||||
return True
|
||||
# if not destfile
|
||||
if not os.path.isfile(tempfile):
|
||||
# tempfile does not exist, this should never happen
|
||||
error("Temporary file %s does not exist, this should not happen." % tempfile)
|
||||
sys.exit(1)
|
||||
# if not tempfile
|
||||
|
||||
fp1 = open(tempfile)
|
||||
fp2 = open(destfile)
|
||||
|
||||
for line1, line2 in itertools.izip(read_skip_comment(fp1, commentstring), read_skip_comment(fp2, commentstring)):
|
||||
if line1 != line2:
|
||||
fp1.close()
|
||||
fp2.close()
|
||||
return True
|
||||
# if differ
|
||||
# for line
|
||||
fp1.close()
|
||||
fp2.close()
|
||||
return False
|
||||
# def diff
|
||||
"""diff destfile and tempfile, returns True if files differ, False if they are the same"""
|
||||
debug.debug("Diffing %s and %s" % (destfile, tempfile), 3)
|
||||
if not os.path.isfile(destfile):
|
||||
debug.debug("Destfile %s does not exist, returning True." % destfile, 3)
|
||||
# destfile does not exist -> copy tempfile over
|
||||
return True
|
||||
# if not destfile
|
||||
if not os.path.isfile(tempfile):
|
||||
# tempfile does not exist, this should never happen
|
||||
error("Temporary file %s does not exist, this should not happen." % tempfile)
|
||||
sys.exit(1)
|
||||
# if not tempfile
|
||||
|
||||
def userConfigGenerated(filename, cfg):
|
||||
"""returns True if filename has been generated by userconfig, False else"""
|
||||
fp1 = open(tempfile)
|
||||
fp2 = open(destfile)
|
||||
|
||||
if not os.path.isfile(filename):
|
||||
# filename does not exist, so it was not generated by userconfig
|
||||
for line1, line2 in zip(read_skip_comment(fp1, commentstring), read_skip_comment(fp2, commentstring)):
|
||||
if line1 != line2:
|
||||
fp1.close()
|
||||
fp2.close()
|
||||
return True
|
||||
# if differ
|
||||
# for line
|
||||
fp1.close()
|
||||
fp2.close()
|
||||
return False
|
||||
# if not filename
|
||||
|
||||
if not cfg.check("Main","stamp"):
|
||||
# no STAMP in userconfig.cfg, so no way to check if file was generated by userconfig
|
||||
|
||||
|
||||
def user_config_generated(filename, cfg):
|
||||
"""returns True if filename has been generated by userconfig, False else"""
|
||||
|
||||
if not os.path.isfile(filename):
|
||||
# filename does not exist, so it was not generated by userconfig
|
||||
return False
|
||||
|
||||
if not cfg.check("Main","stamp"):
|
||||
# no STAMP in userconfig.cfg, so no way to check if file was generated by userconfig
|
||||
return False
|
||||
|
||||
fp = open(filename, "r")
|
||||
|
||||
for line in fp:
|
||||
if re.search(re.escape(cfg.get("Main","stamp")), line):
|
||||
return True
|
||||
return False
|
||||
# no STAMP
|
||||
|
||||
fp = open(filename, "r")
|
||||
|
||||
for line in fp:
|
||||
if re.search(re.escape(cfg.get("Main","stamp")), line):
|
||||
return True
|
||||
# if search
|
||||
# for line
|
||||
return False
|
||||
# def userConfigGenerated
|
||||
|
||||
def backupFile(filename, debug):
|
||||
"""make backup of filename, returns True if backup is successful, False else"""
|
||||
if os.path.isfile(filename):
|
||||
debug.debug("%s exists, finding backup name." % filename, 3)
|
||||
backupname = filename+".userconfig."+time.strftime("%F")
|
||||
testbackupname = backupname
|
||||
counter = 0
|
||||
while os.path.isfile(testbackupname):
|
||||
counter+=1
|
||||
testbackupname=backupname+"."+str(counter)
|
||||
# while
|
||||
debug.debug("Renaming %s to %s" % (filename, testbackupname), 1)
|
||||
os.rename(filename, testbackupname)
|
||||
return True
|
||||
else:
|
||||
debug.debug("%s does not exist, do not need backup." % filename, 3)
|
||||
# if filename
|
||||
return False
|
||||
# def backupFile
|
||||
|
||||
def copyFile(sourcefile, destfile, debug):
|
||||
"""copy sourcefile to destfile, returns True if successful, False else"""
|
||||
|
||||
if os.path.isfile(sourcefile):
|
||||
# sourcefile exists
|
||||
debug.debug("Source file %s exists, proceeding with copy." % sourcefile, 3)
|
||||
if not os.path.isfile(destfile) or os.access(destfile, os.W_OK):
|
||||
debug.debug("Copying %s to %s" % (sourcefile, destfile), 1)
|
||||
shutil.copy(sourcefile, destfile)
|
||||
return True
|
||||
# destfile is writable
|
||||
def backup_file(filename, debug):
|
||||
"""make backup of filename, returns True if backup is successful, False else"""
|
||||
if os.path.isfile(filename):
|
||||
debug.debug("%s exists, finding backup name." % filename, 3)
|
||||
backupname = filename+".userconfig."+time.strftime("%F")
|
||||
testbackupname = backupname
|
||||
counter = 0
|
||||
while os.path.isfile(testbackupname):
|
||||
counter+=1
|
||||
testbackupname=backupname+"."+str(counter)
|
||||
debug.debug("Renaming %s to %s" % (filename, testbackupname), 1)
|
||||
os.rename(filename, testbackupname)
|
||||
return True
|
||||
else:
|
||||
debug.debug("Destination file %s does not exist or is not writable." % destfile, 3)
|
||||
# if write ok
|
||||
return False
|
||||
# def copyFile
|
||||
debug.debug("%s does not exist, do not need backup." % filename, 3)
|
||||
return False
|
||||
|
||||
|
||||
def copy_file(sourcefile, destfile, debug):
|
||||
"""copy sourcefile to destfile, returns True if successful, False else"""
|
||||
|
||||
if os.path.isfile(sourcefile):
|
||||
# sourcefile exists
|
||||
debug.debug("Source file %s exists, proceeding with copy." % sourcefile, 3)
|
||||
if not os.path.isfile(destfile) or os.access(destfile, os.W_OK):
|
||||
debug.debug("Copying %s to %s" % (sourcefile, destfile), 1)
|
||||
shutil.copy(sourcefile, destfile)
|
||||
return True
|
||||
# destfile is writable
|
||||
else:
|
||||
debug.debug("Destination file %s does not exist or is not writable." % destfile, 3)
|
||||
return False
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
# encoding: utf-8
|
||||
#
|
||||
# $Id$
|
||||
# $URL$
|
||||
|
||||
"""
|
||||
cfgfile.py
|
||||
@@ -10,87 +8,69 @@ cfgfile.py
|
||||
Created by Marcus Stoegbauer on 2013-01-12.
|
||||
Copyright (c) 2013 __MyCompanyName__. All rights reserved.
|
||||
"""
|
||||
import ConfigParser
|
||||
import configparser
|
||||
import os
|
||||
import re
|
||||
|
||||
|
||||
class Conf(object):
|
||||
confobj = ConfigParser.RawConfigParser()
|
||||
cfgfile = ''
|
||||
debug = None
|
||||
|
||||
def __init__(self, filename = None):
|
||||
"""if filename is set, open config file and initialize the ConfigParser
|
||||
"""
|
||||
self.confobj = ConfigParser.RawConfigParser()
|
||||
if filename:
|
||||
self.setfilename(filename)
|
||||
# if filename
|
||||
# def __init__
|
||||
|
||||
def setdebug(self, debug):
|
||||
"""docstring for setdebug"""
|
||||
self.debug = debug
|
||||
# def setdebug
|
||||
|
||||
def setfilename(self, filename):
|
||||
"""initialize the ConfigParser
|
||||
"""
|
||||
ret = self.confobj.read(filename)
|
||||
if len(ret) == 0 or ret[0] != filename:
|
||||
raise Exception('Cannot read config file ' + filename)
|
||||
# if cannot read
|
||||
self.cfgfile = filename
|
||||
if self.debug:
|
||||
self.debug.debug("Read config file %s" % filename, 2)
|
||||
self.debug.debug("Replacing environment variables in %s." % filename, 3)
|
||||
# if debug
|
||||
confobj = configparser.RawConfigParser()
|
||||
cfgfile = ''
|
||||
debug = None
|
||||
|
||||
for s in self.confobj.sections():
|
||||
for (i, val) in self.confobj.items(s):
|
||||
tempre = re.search("\$([A-Z]+)[^A-Z]*", val)
|
||||
if tempre:
|
||||
varname = tempre.group(1)
|
||||
if self.debug:
|
||||
self.debug.debug("Found variable %s in %s." % (varname, i), 3)
|
||||
# if debug
|
||||
if os.environ.has_key(varname):
|
||||
if self.debug:
|
||||
self.debug.debug("%s exists in environment, replacing with %s." % (varname, os.environ[varname]), 3)
|
||||
# if debug
|
||||
self.set(s, i, val.replace("$"+varname, os.environ[varname]))
|
||||
# if has_key
|
||||
# if tempre
|
||||
# for i
|
||||
# for s
|
||||
# def setfilename
|
||||
def __init__(self, filename=None):
|
||||
"""if filename is set, open config file and initialize the ConfigParser
|
||||
"""
|
||||
self.confobj = configparser.RawConfigParser()
|
||||
if filename:
|
||||
self.setfilename(filename)
|
||||
|
||||
def get(self, section, option):
|
||||
"""returns the value of option in section
|
||||
"""
|
||||
if not self.cfgfile:
|
||||
raise Exception('No config file set')
|
||||
# if not cfgfile
|
||||
return self.confobj.get(section, option)
|
||||
# def get
|
||||
def setdebug(self, debug):
|
||||
"""docstring for setdebug"""
|
||||
self.debug = debug
|
||||
|
||||
def set(self, section, option, value):
|
||||
"""docstring for update"""
|
||||
self.confobj.set(section, option, value)
|
||||
# def set
|
||||
def setfilename(self, filename):
|
||||
"""initialize the ConfigParser
|
||||
"""
|
||||
ret = self.confobj.read(filename)
|
||||
if len(ret) == 0 or ret[0] != filename:
|
||||
raise Exception('Cannot read config file ' + filename)
|
||||
self.cfgfile = filename
|
||||
if self.debug:
|
||||
self.debug.debug("Read config file %s" % filename, 2)
|
||||
self.debug.debug("Replacing environment variables in %s." % filename, 3)
|
||||
|
||||
for s in self.confobj.sections():
|
||||
for (i, val) in self.confobj.items(s):
|
||||
tempre = re.search(r"\$([A-Z]+)[^A-Z]*", val)
|
||||
if tempre:
|
||||
varname = tempre.group(1)
|
||||
if self.debug:
|
||||
self.debug.debug("Found variable %s in %s." % (varname, i), 3)
|
||||
if varname in os.environ:
|
||||
if self.debug:
|
||||
self.debug.debug("%s exists in environment, replacing with %s." %
|
||||
(varname, os.environ[varname]), 3)
|
||||
self.set(s, i, val.replace("$"+varname, os.environ[varname]))
|
||||
|
||||
def getitems(self, section):
|
||||
"""returns all items in section
|
||||
"""
|
||||
if not self.cfgfile:
|
||||
raise Exception('No config file set')
|
||||
# if not cfgfile
|
||||
return self.confobj.items(section)
|
||||
# def getitems
|
||||
def get(self, section, option):
|
||||
"""returns the value of option in section
|
||||
"""
|
||||
if not self.cfgfile:
|
||||
raise Exception('No config file set')
|
||||
return self.confobj.get(section, option)
|
||||
|
||||
def check(self, section, option):
|
||||
"""checks for option in section"""
|
||||
return self.confobj.has_option(section, option)
|
||||
# def check
|
||||
# class Conf
|
||||
def set(self, section, option, value):
|
||||
"""docstring for update"""
|
||||
self.confobj.set(section, option, value)
|
||||
|
||||
def getitems(self, section):
|
||||
"""returns all items in section
|
||||
"""
|
||||
if not self.cfgfile:
|
||||
raise Exception('No config file set')
|
||||
return self.confobj.items(section)
|
||||
|
||||
def check(self, section, option):
|
||||
"""checks for option in section"""
|
||||
return self.confobj.has_option(section, option)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
# encoding: utf-8
|
||||
#
|
||||
# $Id$
|
||||
@@ -11,68 +11,60 @@ Created by Marcus Stoegbauer on 2013-01-10.
|
||||
Copyright (c) 2013 __MyCompanyName__. All rights reserved.
|
||||
"""
|
||||
|
||||
import sys
|
||||
import os
|
||||
import platform
|
||||
|
||||
class checks(object):
|
||||
def __init__(self):
|
||||
pass
|
||||
# def __init__
|
||||
|
||||
def getShortHostname(self):
|
||||
"""docstring for getShortHostname"""
|
||||
hostname = platform.node()
|
||||
if hostname.count("."):
|
||||
hostname = hostname.split(".")[0]
|
||||
return hostname
|
||||
# def getShortHostname
|
||||
|
||||
def __classesForHost__(self):
|
||||
"""docstring for __classesForHost"""
|
||||
classes = []
|
||||
for c in dir(self):
|
||||
if c.startswith("__"):
|
||||
continue
|
||||
# if __
|
||||
ret = getattr(self, c)()
|
||||
if len(ret) == 3:
|
||||
classes.append(ret)
|
||||
# for c
|
||||
return map(lambda k: (k[1],k[2]), sorted(classes, key=lambda k: k[0]))
|
||||
# def __classesForHost__
|
||||
|
||||
def header(self):
|
||||
"""docstring for header"""
|
||||
return (0, "", "header")
|
||||
# def header
|
||||
|
||||
def footer(self):
|
||||
"""docstring for footer"""
|
||||
return (1000, "", "footer")
|
||||
|
||||
def all(self):
|
||||
"""docstring for all"""
|
||||
return (998, "", "all")
|
||||
# def all
|
||||
|
||||
def arch(self):
|
||||
"""docstring for arch"""
|
||||
return(800, "Arch", platform.system())
|
||||
# def arch
|
||||
|
||||
def hostname(self):
|
||||
"""docstring for hostname"""
|
||||
hostname = self.getShortHostname()
|
||||
return(10, "Host", hostname)
|
||||
# def hostname
|
||||
|
||||
def app(self):
|
||||
"""docstring for app"""
|
||||
hostname = self.getShortHostname()
|
||||
if (hostname == "glitters"):
|
||||
return(500, "", "rancid_hosts")
|
||||
else:
|
||||
return ()
|
||||
# def app
|
||||
# def checks
|
||||
class Checks(object):
|
||||
def __init__(self):
|
||||
pass
|
||||
|
||||
def get_short_hostname(self):
|
||||
"""docstring for getShortHostname"""
|
||||
hostname = platform.node()
|
||||
if hostname.count("."):
|
||||
hostname = hostname.split(".")[0]
|
||||
return hostname
|
||||
|
||||
# def getShortHostname
|
||||
|
||||
def __classes_for_host__(self):
|
||||
"""docstring for __classesForHost"""
|
||||
classes = []
|
||||
for c in dir(self):
|
||||
if c.startswith("__"):
|
||||
continue
|
||||
ret = getattr(self, c)()
|
||||
if len(ret) == 3:
|
||||
classes.append(ret)
|
||||
return map(lambda k: (k[1], k[2]), sorted(classes, key=lambda k: k[0]))
|
||||
|
||||
def header(self):
|
||||
"""docstring for header"""
|
||||
return (0, "", "header")
|
||||
|
||||
def footer(self):
|
||||
"""docstring for footer"""
|
||||
return (1000, "", "footer")
|
||||
|
||||
def all(self):
|
||||
"""docstring for all"""
|
||||
return (998, "", "all")
|
||||
|
||||
def arch(self):
|
||||
"""docstring for arch"""
|
||||
return (800, "Arch", platform.system())
|
||||
|
||||
def hostname(self):
|
||||
"""docstring for hostname"""
|
||||
hostname = self.get_short_hostname()
|
||||
return (10, "Host", hostname)
|
||||
|
||||
def app(self):
|
||||
"""docstring for app"""
|
||||
hostname = self.get_short_hostname()
|
||||
if hostname == "glitters":
|
||||
return (500, "", "rancid_hosts")
|
||||
else:
|
||||
return ()
|
||||
# def app
|
||||
# def checks
|
||||
|
||||
Reference in New Issue
Block a user