X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=utils.py;h=802187e0ca4fd7f0f4c39295197eb37a622e4a0c;hb=64903960a4831d780be79b46e75b6ef15ffcc34e;hp=0422e08d3de7abc1c1c102eda754ad5684463a5e;hpb=8a29f4c7e14d5adc1e45ecb22afea765ec2eecda;p=dak.git diff --git a/utils.py b/utils.py index 0422e08d..802187e0 100644 --- a/utils.py +++ b/utils.py @@ -1,6 +1,6 @@ # Utility functions # Copyright (C) 2000 James Troup -# $Id: utils.py,v 1.16 2001-03-02 02:45:01 troup Exp $ +# $Id: utils.py,v 1.19 2001-03-24 03:29:38 troup Exp $ # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -import commands, os, re, socket, shutil, stat, string, sys, tempfile, apt_pkg +import commands, os, re, socket, shutil, stat, string, sys, tempfile re_comments = re.compile(r"\#.*") re_no_epoch = re.compile(r"^\d*\:") @@ -57,8 +57,6 @@ def our_raw_input(): ###################################################################################### -# Obsoleted by python >= 1.6 - def str_isnum (s): for c in s: if c not in string.digits: @@ -358,10 +356,19 @@ def which_apt_conf_file (): def regex_safe (s): s = string.replace(s, '+', '\\\\+'); + s = string.replace(s, '.', '\\\\.'); return s ###################################################################################### +# Perform a substition of template +def TemplateSubst(Map,Template): + for x in Map.keys(): + Template = string.replace(Template,x,Map[x]); + return Template; + +###################################################################################### + def size_type (c): t = " b"; if c > 10000: