Mercurial > p > roundup > code
changeset 113:2ab86442799a
Replaced errno integers with their module values.
De-tabbed templatebuilder.py
| author | Richard Jones <richard@users.sourceforge.net> |
|---|---|
| date | Sat, 28 Jul 2001 07:59:53 +0000 |
| parents | e4170b2b2561 |
| children | caca379e12d3 |
| files | roundup/htmltemplate.py roundup/init.py roundup/templatebuilder.py |
| diffstat | 3 files changed, 38 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/roundup/htmltemplate.py Sat Jul 28 07:35:27 2001 +0000 +++ b/roundup/htmltemplate.py Sat Jul 28 07:59:53 2001 +0000 @@ -1,6 +1,6 @@ -# $Id: htmltemplate.py,v 1.3 2001-07-25 03:39:47 richard Exp $ +# $Id: htmltemplate.py,v 1.4 2001-07-28 07:59:53 richard Exp $ -import os, re, StringIO, urllib, cgi +import os, re, StringIO, urllib, cgi, errno import hyperdb, date @@ -514,7 +514,7 @@ template = open(os.path.join(templates, classname+'.filter')).read() all_filters = col_re.findall(template) except IOError, error: - if error.errno != 2: raise + if error.errno != errno.ENOENT: raise template = None all_filters = [] if template and filter: @@ -795,6 +795,12 @@ # # $Log: not supported by cvs2svn $ +# Revision 1.3 2001/07/25 03:39:47 richard +# Hrm - displaying links to classes that don't specify a key property. I've +# got it defaulting to 'name', then 'title' and then a "random" property (first +# one returned by getprops().keys(). +# Needs to be moved onto the Class I think... +# # Revision 1.2 2001/07/22 12:09:32 richard # Final commit of Grande Splite #
--- a/roundup/init.py Sat Jul 28 07:35:27 2001 +0000 +++ b/roundup/init.py Sat Jul 28 07:59:53 2001 +0000 @@ -1,6 +1,6 @@ -# $Id: init.py,v 1.6 2001-07-24 11:18:25 anthonybaxter Exp $ +# $Id: init.py,v 1.7 2001-07-28 07:59:53 richard Exp $ -import os, shutil, sys +import os, shutil, sys, errno def copytree(src, dst, symlinks=0): """Recursively copy a directory tree using copy2(). @@ -19,7 +19,7 @@ try: os.mkdir(dst) except OSError, error: - if error.errno != 17: raise + if error.errno != errno.EEXIST: raise for name in names: srcname = os.path.join(src, name) dstname = os.path.join(dst, name) @@ -57,6 +57,9 @@ # # $Log: not supported by cvs2svn $ +# Revision 1.6 2001/07/24 11:18:25 anthonybaxter +# oops. left a print in +# # Revision 1.5 2001/07/24 10:54:11 anthonybaxter # oops. Html. #
--- a/roundup/templatebuilder.py Sat Jul 28 07:35:27 2001 +0000 +++ b/roundup/templatebuilder.py Sat Jul 28 07:59:53 2001 +0000 @@ -1,3 +1,5 @@ +import errno + preamble = """ # Do Not Edit (Unless You Want To) # This file automagically generated by roundup.htmldata.makeHtmlBase @@ -15,10 +17,10 @@ fd = open(os.path.join(templateDir, 'htmlbase.py'), 'w') fd.write(preamble) for file in filelist: - mangled_name = os.path.basename(re.sub(r'\.', 'DOT', file)) - fd.write('%s = """'%mangled_name) - fd.write(open(file).read()) - fd.write('"""\n\n') + mangled_name = os.path.basename(re.sub(r'\.', 'DOT', file)) + fd.write('%s = """'%mangled_name) + fd.write(open(file).read()) + fd.write('"""\n\n') fd.close() def installHtmlBase(template, installDir): @@ -28,32 +30,35 @@ tdir = __import__('roundup.templates.%s.htmlbase'%template).templates if hasattr(tdir, template): - tmod = getattr(tdir, template) + tmod = getattr(tdir, template) else: - raise "TemplateError", \ - "couldn't find roundup.template.%s.htmlbase"%template + raise "TemplateError", "couldn't find roundup.template.%s.htmlbase"%template htmlbase = tmod.htmlbase installDir = os.path.join(installDir, 'html') - os.makedirs(installDir) + try: + os.makedirs(installDir) + except IOError, error: + if error.errno != errno.EEXIST: raise print "installing from", htmlbase.__file__, "into", installDir modulecontents = dir(htmlbase) for mangledfile in modulecontents: - if mangledfile[0] == "_": - continue - filename = re.sub('DOT', '.', mangledfile) - outfile = os.path.join(installDir, filename) - outfd = open(outfile, 'w') - data = getattr(htmlbase, mangledfile) - outfd.write(data) + if mangledfile[0] == "_": + continue + filename = re.sub('DOT', '.', mangledfile) + outfile = os.path.join(installDir, filename) + outfd = open(outfile, 'w') + data = getattr(htmlbase, mangledfile) + outfd.write(data) if __name__ == "__main__": import sys if len(sys.argv) == 2: - makeHtmlBase(sys.argv[1]) + makeHtmlBase(sys.argv[1]) elif len(sys.argv) == 3: - installHtmlBase(sys.argv[1], sys.argv[2]) + installHtmlBase(sys.argv[1], sys.argv[2]) else: - raise "what you talkin about willis?" + raise "what you talkin about willis?" +
