launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #01159
[Merge] lp:~jcsackett/launchpad/unknown-blueprints-service-597738-2 into lp:launchpad/devel
j.c.sackett has proposed merging lp:~jcsackett/launchpad/unknown-blueprints-service-597738-2 into lp:launchpad/devel with lp:~jcsackett/launchpad/series-need-usage-attributes-643902 as a prerequisite.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
Summary
=======
Cleans up the unknown-specs template in blueprints by leveraging work in a branch that adds usage enums to product and distribution series.
Proposed Fix
============
Remove nasty python conditionals from the template and use the now added attributes.
Implementation details
======================
As in proposed fix.
Tests
=====
bin/test -m lp.blueprints
Demo and Q/A
============
Open http://blueprints.launchpad.dev/kubuntu/krunch and http://blueprints.launchpad.dev/firefox/trunk; both should work fine and display a "Launchpad doesn't know how" message.
Lint
====
Output:
= Launchpad lint =
Checking for conflicts and issues in changed files.
Linting changed files:
lib/lp/blueprints/templates/unknown-specs.pt
lib/lp/registry/adapters.py
lib/lp/registry/configure.zcml
lib/lp/registry/interfaces/distroseries.py
lib/lp/registry/interfaces/productseries.py
lib/lp/registry/model/distroseries.py
lib/lp/registry/model/productseries.py
lib/lp/registry/tests/test_service_usage.py
./lib/lp/blueprints/templates/unknown-specs.pt
20: not well-formed (invalid token)
./lib/lp/registry/interfaces/distroseries.py
417: E301 expected 1 blank line, found 2
458: E301 expected 1 blank line, found 0
./lib/lp/registry/model/distroseries.py
364: E301 expected 1 blank line, found 2
708: E301 expected 1 blank line, found 2
Errors are a result of lint's comment/blank line issue.
Output mucked up by merged precondition branch.
--
https://code.launchpad.net/~jcsackett/launchpad/unknown-blueprints-service-597738-2/+merge/36242
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jcsackett/launchpad/unknown-blueprints-service-597738-2 into lp:launchpad/devel.
=== modified file 'lib/lp/blueprints/templates/unknown-specs.pt'
--- lib/lp/blueprints/templates/unknown-specs.pt 2010-09-16 16:47:37 +0000
+++ lib/lp/blueprints/templates/unknown-specs.pt 2010-09-22 01:01:14 +0000
@@ -6,9 +6,13 @@
metal:use-macro="view/macro:page/main_side"
i18n:domain="launchpad"
>
+<head>
+ <tal:head_epilogue metal:fill-slot="head_epilogue">
+ <meta name="robots" content="noindex,nofollow" />
+ </tal:head_epilogue>
+</head>
<body>
-
<div metal:fill-slot="main">
<div class="top-portlet">
<div id="specs-unknown">
@@ -20,36 +24,12 @@
planning or documentation.
</p>
</div>
-
- <div tal:omit-tag tal:condition="view/is_series">
- <div
- tal:omit-tag
- tal:define="target python:view.context.product and view.context.product or view.context.distribution;
- blueprints_usage target/blueprints_usage">
- <p tal:condition="blueprints_usage/enumvalue:EXTERNAL">
- <tal:project replace="target/displayname" />'s
- <tal:project replace="view/context/displayname" /> series does
- not use Launchpap for planning or documentation.
- </p>
- <p tal:condition="blueprints_usage/enumvalue:NOT_APPLICABLE">
- <tal:project replace="target/displayname" />'s
- <tal:project replace="view/context/displayname" /> series does not track
- feature planning or documentation.
- </p>
- <p tal:condition="blueprints_usage/enumvalue:UNKNOWN">
- Launchpad does not know how
- <tal:project replace="target/displayname" />'s
- <tal:project replace="view/context/displayname" /> series tracks feature
- planning or documentation.
- </p>
- </div>
- </div>
-
+
<div tal:omit-tag
- tal:condition="python:not (view.is_project or view.is_series)">
+ tal:condition="not:view/is_project">
<div tal:omit-tag tal:define="blueprints_usage view/context/blueprints_usage">
<p tal:condition="blueprints_usage/enumvalue:EXTERNAL">
- <tal:project replace="view/context/displayname" /> does not use launchpad
+ <tal:project replace="view/context/displayname" /> does not use Launchpad
for planning or documentation.
</p>
<p tal:condition="blueprints_usage/enumvalue:NOT_APPLICABLE">
@@ -57,7 +37,7 @@
feature planning or documentation.
</p>
<p tal:condition="blueprints_usage/enumvalue:UNKNOWN">
- launchpad does not know how
+ Launchpad does not know how
<tal:project replace="view/context/displayname" /> tracks feature
planning or documentation.
</p>
=== modified file 'lib/lp/registry/tests/test_service_usage.py'
--- lib/lp/registry/tests/test_service_usage.py 2010-09-22 01:01:13 +0000
+++ lib/lp/registry/tests/test_service_usage.py 2010-09-22 01:01:14 +0000
@@ -145,6 +145,7 @@
class SeriesUsageEnumsMixin(object):
"""Mixin to test the usage attributes on product and distro series."""
+
def setUp(self):
self.series = None
self.series_pillar = None
