diff options
| -rw-r--r-- | TODO | 2 | ||||
| -rwxr-xr-x | pagehandler.py | 2 | ||||
| -rwxr-xr-x | patchtracker/Templates.py (renamed from patchtracker/Writers.py) | 35 |
3 files changed, 3 insertions, 36 deletions
@@ -14,7 +14,7 @@ code cleanup from really ugly stuff (look for XXX) dead code removal/cleanup after switching a few design decisions, there's some code that's no longer - used or should be renamed/moved (i.e. writers/templates) + used or should be removed == medium-range TODO == diff --git a/pagehandler.py b/pagehandler.py index 48d6cb4..e6267ed 100755 --- a/pagehandler.py +++ b/pagehandler.py @@ -5,7 +5,7 @@ import cgi import os import sys import patchtracker.Conf as Conf -from patchtracker.Writers import ErrorTemplate, PatchTemplate, PackageVersTemplate, LetterTocTemplate, FrontPageTemplate +from patchtracker.Templates import ErrorTemplate, PatchTemplate, PackageVersTemplate, LetterTocTemplate, FrontPageTemplate from patchtracker.DiffGzHandler import DiffGzHandler import patchtracker.DB as DB from patchtracker.DB import PatchTrackerDB diff --git a/patchtracker/Writers.py b/patchtracker/Templates.py index c3b59aa..d8657c1 100755 --- a/patchtracker/Writers.py +++ b/patchtracker/Templates.py @@ -14,10 +14,8 @@ class OurTemplate(Template): ourSearchList[k]=v Template.__init__(self, file=file, searchList=ourSearchList) -class PackageVersTemplate(OurTemplate): - src = None - suite = None +class PackageVersTemplate(OurTemplate): def __init__(self, srcpkg, suite): self.src = srcpkg self.suite = suite @@ -31,9 +29,6 @@ class PackageVersTemplate(OurTemplate): OurTemplate.__init__(self, file=tpl, searchList=sl) class FrontPageTemplate(OurTemplate): - allindex = None - relindices = [] - def __init__(self, allindex): tpl = os.sep.join([Conf.template_dir, "frontpage.tmpl"]) OurTemplate.__init__(self, file=tpl) @@ -64,31 +59,3 @@ class PatchTemplate(OurTemplate): sl = {'package':pkg, 'version':vers, 'name':name, 'patch':patch} OurTemplate.__init__(self, file=tpl, searchList=sl) -class PageWriter: - def __init__(self, filename, template): - try: - os.makedirs(os.path.dirname(filename)) - except OSError, e: - if e.errno != errno.EEXIST: - raise e - o = file(filename, "w") - o.write(str(template)) - o.close() - -class PackageVersWriter(PageWriter): - def __init__(self, srcpkg, suite): - t = PackageVersTemplate(srcpkg,suite) - dstdir = os.sep.join([Conf.output_dir, "package", t.src.name, t.src.version]) - try: - os.makedirs(dstdir) - except OSError, e: - if e.errno != errno.EEXIST: - raise e - dst = os.sep.join([dstdir, "index.html"]) - PageWriter.__init__(self, dst, t) - -class FrontPageWriter(PageWriter): - def __init__(self, allindex, release_indices=[]): - t = FrontPageTemplate(allindex, release_indices) - dest = os.sep.join([Conf.output_dir, "index.html"]) - PageWriter.__init__(self, dest, t) |