# # # delete "html.py" # # delete "wrapper.py" # # rename "version.py" # to "release.py" # # patch "common.py" # from [4fa89aedc63a6f49d4a9a5eebe210b4db78c4974] # to [02468252bf61578b2443ee7b77fceb7207136127] # # patch "release.py" # from [a071b2192e2092ec222ab0d59ef95efd1c9c81e6] # to [9606208d767e8ed4999ca37fa5e20d13f3fa7be5] # # patch "release.sh" # from [7abdadf5fa9512c5f8cfa0ef3c7a6821ca33a992] # to [65fe70e241d026a9e09530245362cb09287b6608] # # patch "templates/about.html" # from [2036ac18da76b817890897d85a9bf7ada97b65ee] # to [3edc14e5523b7d8ebe685d3a2b186656bc27295e] # # patch "templates/base.html" # from [690e3c561fca7bc2790a5f231ce4fdc99004765e] # to [96ce364d2dfd62b29e6557bebfd3e5f9a6c87b46] # # patch "viewmtn.py" # from [0c9d6ac2d7997b127171579d0cad858cb8dda26a] # to [b7e700fb84ff8a7c9e5e014fe97429e663d4b1ac] # ============================================================ --- common.py 4fa89aedc63a6f49d4a9a5eebe210b4db78c4974 +++ common.py 02468252bf61578b2443ee7b77fceb7207136127 @@ -47,12 +47,3 @@ def ago(event): rv = "%s" % (plural(minutes, "minute", "minutes")) return rv -# is it binary? -def is_binary(str): - nontext_chars = "\x01\x02\x03\x04\x05\x06\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1c\x1d\x1e\x1f" - check = {} - for char in nontext_chars: - check[char] = True - for i in str: - if check.has_key(i): return True - return False ============================================================ --- version.py a071b2192e2092ec222ab0d59ef95efd1c9c81e6 +++ release.py 9606208d767e8ed4999ca37fa5e20d13f3fa7be5 @@ -1,3 +1,12 @@ +version='0.06beta' +authors='''Authors: +Grahame Bowland +Contributors: +Matt Johnston +Nathaniel Smith +Bruce Stephens +Lapo Luchini +David Reiss + +''' -# the latest release; make sure to update this (note for Grahame) -release = "0.05" ============================================================ --- release.sh 7abdadf5fa9512c5f8cfa0ef3c7a6821ca33a992 +++ release.sh 65fe70e241d026a9e09530245362cb09287b6608 @@ -1,8 +1,11 @@ #!/bin/sh # generate the help file data -AUTHORS=authors.py -echo -n "authors='''" > "$AUTHORS" -cat AUTHORS >> "$AUTHORS" -echo "'''" >> "$AUTHORS" +OUT="release.py" +RELEASE="0.06beta" +echo -n > "$OUT" +echo "version='$RELEASE'" > "$OUT" +echo -n "authors='''" >> "$OUT" +cat AUTHORS >> "$OUT" +echo "'''" >> "$OUT" ============================================================ --- templates/about.html 2036ac18da76b817890897d85a9bf7ada97b65ee +++ templates/about.html 3edc14e5523b7d8ebe685d3a2b186656bc27295e ============================================================ --- templates/base.html 690e3c561fca7bc2790a5f231ce4fdc99004765e +++ templates/base.html 96ce364d2dfd62b29e6557bebfd3e5f9a6c87b46 @@ -34,7 +34,7 @@ installCallbacks(); ============================================================ --- viewmtn.py 0c9d6ac2d7997b127171579d0cad858cb8dda26a +++ viewmtn.py b7e700fb84ff8a7c9e5e014fe97429e663d4b1ac @@ -20,6 +20,7 @@ from fdo import sharedmimeinfo import cStringIO from colorsys import hls_to_rgb from fdo import sharedmimeinfo +import release hq = cgi.escape import web @@ -291,9 +292,10 @@ class Renderer: 'context' : web.context, # fugly 'dynamic_uri_path' : config.dynamic_uri_path, 'dynamic_join' : dynamic_join, - 'link' : link, 'static_uri_path' : config.static_uri_path, 'static_join' : static_join, + 'link' : link, + 'version' : release.version, } def load_templates(self):