summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@mapreri.org>2015-01-08 17:01:14 +0100
committerHolger Levsen <holger@layer-acht.org>2015-01-08 17:11:02 +0100
commitad68a3bed482cc7b3f40c68cb74f90a64978e33b (patch)
treeb8d900f37991c8aba1ba8d9944735c439bf715d5 /bin
parent8f2d4fb6b01c935fc1b68dd56f1c3fa65d8aa84a (diff)
downloadjenkins.debian.net-ad68a3bed482cc7b3f40c68cb74f90a64978e33b.tar.xz
reproducible: fix TypeError with wheezy's python
Diffstat (limited to 'bin')
-rwxr-xr-xbin/reproducible_common.py4
-rwxr-xr-xbin/reproducible_html_notes.py20
2 files changed, 12 insertions, 12 deletions
diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py
index dd8b19f9..61584460 100755
--- a/bin/reproducible_common.py
+++ b/bin/reproducible_common.py
@@ -146,14 +146,14 @@ html_head_page = Template((tab*2).join("""
<li><a href="/userContent/index_stats.html">stats</a></li>
<li><a href="/userContent/index_pkg_sets.html">package sets stats</a></li>
</ul>
-</header>""".splitlines(keepends=True)))
+</header>""".splitlines(True)))
html_foot_page = Template((tab*2).join("""
<p style="font-size:0.9em;">
A package name displayed with a bold font is an indication that this
package has a note. Visited packages are linked in green, those which
have not been visited are linked in blue.
-</p>""".splitlines(keepends=True)))
+</p>""".splitlines(True)))
url2html = re.compile(r'((mailto\:|((ht|f)tps?)\://|file\:///){1}\S+)')
diff --git a/bin/reproducible_html_notes.py b/bin/reproducible_html_notes.py
index 99505ad7..b6b6f103 100755
--- a/bin/reproducible_html_notes.py
+++ b/bin/reproducible_html_notes.py
@@ -30,7 +30,7 @@ note_html = Template((tab*2).join("""
</p>
</td>
</tr>
-</table>""".splitlines(keepends=True)))
+</table>""".splitlines(True)))
note_issues_html = Template((tab*3).join("""
<tr>
<td>
@@ -39,7 +39,7 @@ note_issues_html = Template((tab*3).join("""
<td>
$issues
</td>
-</tr>""".splitlines(keepends=True)))
+</tr>""".splitlines(True)))
note_bugs_html = Template((tab*4).join("""
<tr>
<td>
@@ -48,7 +48,7 @@ note_bugs_html = Template((tab*4).join("""
<td>
$bugs
</td>
-</tr>""".splitlines(keepends=True)))
+</tr>""".splitlines(True)))
note_comments_html = Template((tab*3).join("""
<tr>
<td>
@@ -57,7 +57,7 @@ note_comments_html = Template((tab*3).join("""
<td>
$comments
</td>
-</tr>""".splitlines(keepends=True)))
+</tr>""".splitlines(True)))
note_issue_html_url = Template((tab*6).join("""
<tr>
@@ -67,7 +67,7 @@ note_issue_html_url = Template((tab*6).join("""
<td>
<a href="$url" target="_blank">$url</a>
</td>
-</tr>""".splitlines(keepends=True)))
+</tr>""".splitlines(True)))
note_issue_html_desc = Template((tab*6).join("""
<tr>
<td>
@@ -76,7 +76,7 @@ note_issue_html_desc = Template((tab*6).join("""
<td>
$description
</td>
-</tr>""".splitlines(keepends=True)))
+</tr>""".splitlines(True)))
note_issue_html = Template((tab*5).join(("""
<table class="body">
<tr>
@@ -89,7 +89,7 @@ note_issue_html = Template((tab*5).join(("""
</tr>
$issue_info
</table>
-""" % ISSUES_URI).splitlines(keepends=True)))
+""" % ISSUES_URI).splitlines(True)))
issue_html_url = Template((tab*4).join("""
<tr>
@@ -99,7 +99,7 @@ issue_html_url = Template((tab*4).join("""
<td>
<a href="$url">$url</a>
</td>
-</tr>""".splitlines(keepends=True)))
+</tr>""".splitlines(True)))
issue_html = Template((tab*3).join("""
<table class="body">
<tr>
@@ -133,7 +133,7 @@ $affected_pkgs
<p>Notes are stored in <a href="https://anonscm.debian.org/cgit/reproducible/notes.git">notes.git</a>.</p>
</td>
</tr>
-</table>""".splitlines(keepends=True)))
+</table>""".splitlines(True)))
def load_notes():
@@ -287,7 +287,7 @@ def iterate_over_issues(issues):
def index_issues(issues):
templ = "\n<table class=\"body\">\n" + tab + "<tr>\n" + tab*2 + "<th>\n" \
+ tab*3 + "Identified issues\n" + tab*2 + "</th>\n" + tab + "</tr>\n"
- html = (tab*2).join(templ.splitlines(keepends=True))
+ html = (tab*2).join(templ.splitlines(True))
for issue in sorted(issues):
html += tab*3 + '<tr><td><a href="' + ISSUES_URI + '/' + issue + \
'_issue.html">' + issue + '</a></td></tr>\n'