Merge lp:~jcsackett/launchpad/unknown-blueprints-service-597738-2 into lp:launchpad

Proposed by j.c.sackett
Status: Merged
Approved by: j.c.sackett
Approved revision: no longer in the source branch.
Merged at revision: 11631
Proposed branch: lp:~jcsackett/launchpad/unknown-blueprints-service-597738-2
Merge into: lp:launchpad
Prerequisite: lp:~jcsackett/launchpad/series-need-usage-attributes-643902
Diff against target: 120 lines (+23/-48)
2 files modified
lib/lp/blueprints/templates/unknown-specs.pt (+22/-48)
lib/lp/registry/tests/test_service_usage.py (+1/-0)
To merge this branch: bzr merge lp:~jcsackett/launchpad/unknown-blueprints-service-597738-2
Reviewer Review Type Date Requested Status
Edwin Grubbs (community) code Approve
Review via email: mp+36242@code.launchpad.net

Commit message

Cleans up unknown-specs template; template used to use a nasty python conditional and didn't have norobots; nofollow.

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Edwin Grubbs (edwin-grubbs) wrote :

Hi JC,

This branch looks good.

-Edwin

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/blueprints/templates/unknown-specs.pt'
--- lib/lp/blueprints/templates/unknown-specs.pt 2010-09-23 15:15:02 +0000
+++ lib/lp/blueprints/templates/unknown-specs.pt 2010-09-24 15:22:50 +0000
@@ -6,7 +6,6 @@
6 metal:use-macro="view/macro:page/main_side"6 metal:use-macro="view/macro:page/main_side"
7 i18n:domain="launchpad"7 i18n:domain="launchpad"
8>8>
9
10<head>9<head>
11 <tal:head_epilogue metal:fill-slot="head_epilogue">10 <tal:head_epilogue metal:fill-slot="head_epilogue">
12 <meta name="robots" content="noindex,nofollow" />11 <meta name="robots" content="noindex,nofollow" />
@@ -14,48 +13,23 @@
14</head>13</head>
1514
16<body>15<body>
17
18<div metal:fill-slot="main">16<div metal:fill-slot="main">
19 <div class="top-portlet">17 <div class="top-portlet">
20 <div id="specs-unknown">18 <div id="specs-unknown">
21 <strong>19 <strong>
22 <tal:is_project condition="view/is_project">20 <tal:is-project condition="view/is_project">
23 <p>21 <p>
24 Launchpad does not know how22 Launchpad does not know how
25 <tal:project replace="view/context/displayname" /> tracks feature23 <tal:project replace="view/context/displayname" /> tracks feature
26 planning or documentation.24 planning or documentation.
27 </p>25 </p>
28 </tal:is_project>26 </tal:is-project>
2927
30 <tal:is_series condition="view/is_series">28 <tal:not-project
31 <div29 condition="not:view/is_project">
32 tal:omit-tag=""30 <tal:blueprints define="blueprints_usage view/context/blueprints_usage">
33 tal:define="target python:view.context.product and view.context.product or view.context.distribution;31 <p tal:condition="blueprints_usage/enumvalue:EXTERNAL">
34 blueprints_usage target/blueprints_usage">32 <tal:project replace="view/context/displayname" /> does not use Launchpad
35 <p tal:condition="blueprints_usage/enumvalue:EXTERNAL">
36 <tal:project replace="target/displayname" />'s
37 <tal:project replace="view/context/displayname" /> series does
38 not use Launchpap for planning or documentation.
39 </p>
40 <p tal:condition="blueprints_usage/enumvalue:NOT_APPLICABLE">
41 <tal:project replace="target/displayname" />'s
42 <tal:project replace="view/context/displayname" /> series does not track
43 feature planning or documentation.
44 </p>
45 <p tal:condition="blueprints_usage/enumvalue:UNKNOWN">
46 Launchpad does not know how
47 <tal:project replace="target/displayname" />'s
48 <tal:project replace="view/context/displayname" /> series tracks feature
49 planning or documentation.
50 </p>
51 </div>
52 </tal:is_series>
53
54 <tal:not_project_or_series
55 condition="python:not (view.is_project or view.is_series)">
56 <div tal:omit-tag="" tal:define="blueprints_usage view/context/blueprints_usage">
57 <p tal:condition="blueprints_usage/enumvalue:EXTERNAL">
58 <tal:project replace="view/context/displayname" /> does not use launchpad
59 for planning or documentation.33 for planning or documentation.
60 </p>34 </p>
61 <p tal:condition="blueprints_usage/enumvalue:NOT_APPLICABLE">35 <p tal:condition="blueprints_usage/enumvalue:NOT_APPLICABLE">
@@ -63,25 +37,25 @@
63 feature planning or documentation.37 feature planning or documentation.
64 </p>38 </p>
65 <p tal:condition="blueprints_usage/enumvalue:UNKNOWN">39 <p tal:condition="blueprints_usage/enumvalue:UNKNOWN">
66 launchpad does not know how40 Launchpad does not know how
67 <tal:project replace="view/context/displayname" /> tracks feature41 <tal:project replace="view/context/displayname" /> tracks feature
68 planning or documentation.42 planning or documentation.
69 </p>43 </p>
70 </div>44 </tal:blueprints>
71 </tal:not_project_or_series>45 </tal:not-project>
72 </strong>46 </strong>
7347
74 <tal:has_wiki condition="view/has_wiki">48 <tal:has-wiki tal:condition="view/has_wiki">
75 <p id="wiki-fallback"49 <p id="wiki-fallback"
76 tal:define="wiki view/context/wikiurl"50 tal:define="wiki view/context/wikiurl"
77 tal:condition="wiki">51 tal:condition="wiki">
78 <tal:project replace="view/context/displayname" /> has a wiki, which52 <tal:project replace="view/context/displayname" /> has a wiki, which
79 may be used for feature plannning and documentation.<br />53 may be used for feature plannning and documentation.<br />
80 <a tal:attributes="href view/context/wikiurl">54 <a tal:attributes="href view/context/wikiurl">
81 <tal:project replace="view/context/displayname" /> wiki55 <tal:project replace="view/context/displayname" /> wiki
82 </a>56 </a>
83 </p>57 </p>
84 </tal:has_wiki>58 </tal:has-wiki>
85 </div>59 </div>
8660
87 <p id="configure-support"61 <p id="configure-support"
8862
=== modified file 'lib/lp/registry/tests/test_service_usage.py'
--- lib/lp/registry/tests/test_service_usage.py 2010-09-21 14:47:26 +0000
+++ lib/lp/registry/tests/test_service_usage.py 2010-09-24 15:22:50 +0000
@@ -145,6 +145,7 @@
145145
146class SeriesUsageEnumsMixin(object):146class SeriesUsageEnumsMixin(object):
147 """Mixin to test the usage attributes on product and distro series."""147 """Mixin to test the usage attributes on product and distro series."""
148
148 def setUp(self):149 def setUp(self):
149 self.series = None150 self.series = None
150 self.series_pillar = None151 self.series_pillar = None