[Blends-commit] [SCM] website branch, master, updated. 1bc06676f66579fdbad9c099022f1d2ad495b00a

[Ole Streicher]

The following commit has been merged in the master branch:
commit ba5024bd7238167260b8d773f3947d89e68b492b
Author: Ole Streicher <ole at aip.de>
Date:   Thu Mar 17 16:02:00 2016 +0100

    Don't markup short description: it is just a one-liner

diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index 78c1bc5..8984ae1 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -1127,8 +1127,7 @@ class TaskDependencies:
         for lang in languages:
             if ddtptranslations['description_' + lang]:
                 self.metapkg.desc[lang] = {}
-                short = ddtptranslations['description_' + lang]
-                self.metapkg.desc[lang]['short'] = Markup(short)
+                self.metapkg.desc[lang]['short'] = ddtptranslations['description_' + lang]
                 try:
                     self.metapkg.desc[lang]['long'] = Markup(render_longdesc(ddtptranslations['long_description_' + lang].splitlines()))
                 except AttributeError as err:
@@ -1184,8 +1183,8 @@ class TaskDependencies:
                         logger.error("Duplicate description entry in task %s; you probably want to use Pkg-Description field instead!" % self.task)
                     else:
                         (shortDesc, longDesc) = SplitDescription(stanza['description'])
+                        self.metapkg.desc['en']['short'] = shortDesc
                         # Markup strings to enable verbatim output of preformatted text
-                        self.metapkg.desc['en']['short'] = Markup(shortDesc)
                         self.metapkg.desc['en']['long']  = Markup(longDesc)
                         found_description = True
                     continue
@@ -1425,7 +1424,7 @@ class TaskDependencies:
                         _pkg = self.metapkg.PrintedName
                     else:
                         _pkg = dep.pkg
-                    remark['short'] = Markup(shortDesc)
+                    remark['short'] = shortDesc
                     remark['long']  = Markup(longDesc)
                     continue
                 else:
@@ -1607,7 +1606,7 @@ class TaskDependencies:
                 for l in languages:
                     if row.get('description_' + l):
                         dep.desc[l] = {}
-                        dep.desc[l]['short'] = Markup(row['description_' + l])
+                        dep.desc[l]['short'] = row['description_' + l]
                         if row['long_description_' + l]:
                             dep.desc[l]['long']  = Markup(render_longdesc(row['long_description_' + l].splitlines()))
                 if 'short' not in dep.desc['en']:
@@ -1668,7 +1667,7 @@ class TaskDependencies:
                     logger.info("The package %s is not yet in Debian but it is just in the new queue. (Task %s)" % (dep.pkg, dep.taskname))
                 for prop in PROPERTIES:
                     dep.properties[prop] = row[prop]
-                dep.desc['en']['short'] = Markup(row['description_en'])
+                dep.desc['en']['short'] = row['description_en']
                 dep.desc['en']['long']  = Markup(render_longdesc(row['long_description_en'].splitlines()))
                 if row['maintainer']:
                     (_name, _url) = email.utils.parseaddr(row['maintainer'])
@@ -1753,7 +1752,7 @@ class TaskDependencies:
                 if int(row['wnpp']) > 0:
                     dep.properties['wnpp'] = row['wnpp']
                 dep.SetPublications(row)
-                dep.desc['en']['short'] = Markup(row['description_en'])
+                dep.desc['en']['short'] = row['description_en']
                 dep.desc['en']['long']  = Markup(render_longdesc(row['long_description_en'].splitlines()))
                 if row['maintainer']:
                     (_name, _url) = email.utils.parseaddr(row['maintainer'])
@@ -1916,7 +1915,6 @@ class TaskDependencies:
         for dependency in self.dependencies.values():
             for dep in dependency:
                 if dep.desc['en'] != {}:
-                    dep.desc['en']['short'] = Markup(dep.desc['en']['short'])
                     try:
                         dep.desc['en']['long'] = Markup(dep.desc['en']['long'])
                     except KeyError:
diff --git a/webtools/blendstasktools_udd.py b/webtools/blendstasktools_udd.py
index de7520a..07f4473 100644
--- a/webtools/blendstasktools_udd.py
+++ b/webtools/blendstasktools_udd.py
@@ -1038,8 +1038,7 @@ class TaskDependencies:
         for lang in languages:
             if ddtptranslations['description_' + lang]:
                 self.metapkg.desc[lang] = {}
-                short = ddtptranslations['description_' + lang]
-                self.metapkg.desc[lang]['short'] = Markup(short)
+                self.metapkg.desc[lang]['short'] = ddtptranslations['description_' + lang]
                 try:
                     self.metapkg.desc[lang]['long'] = Markup(render_longdesc(ddtptranslations['long_description_' + lang].splitlines()))
                 except AttributeError as err:
@@ -1206,7 +1205,7 @@ class TaskDependencies:
             for l in languages:
                 if row.get('description_' + l):
                     dep.desc[l] = {}
-                    dep.desc[l]['short'] = Markup(row['description_' + l])
+                    dep.desc[l]['short'] = row['description_' + l]
                     if row['long_description_' + l]:
                         dep.desc[l]['long']  = Markup(render_longdesc(row['long_description_' + l].splitlines()))
             if 'short' not in dep.desc['en']:
@@ -1222,7 +1221,7 @@ class TaskDependencies:
 
             if row.get('remark'):
                 (shortDesc, longDesc) = SplitDescription(row['remark'])
-                dep.remark['short'] = Markup(shortDesc)
+                dep.remark['short'] = shortDesc
                 dep.remark['long']  = Markup(longDesc)
 
             # Publications
@@ -1243,8 +1242,8 @@ class TaskDependencies:
         _execute_udd_query(query)
         if curs.rowcount > 0:
             self.metapkg.PrintedName, shortDesc, longDesc = curs.fetchone()
+            self.metapkg.desc['en']['short'] = shortDesc
             # Markup strings to enable verbatim output of preformatted text
-            self.metapkg.desc['en']['short'] = Markup(shortDesc)
             self.metapkg.desc['en']['long']  = Markup(longDesc)
 
 
@@ -1335,7 +1334,6 @@ class TaskDependencies:
         for dependency in self.dependencies.values():
             for dep in dependency:
                 if dep.desc['en'] != {}:
-                    dep.desc['en']['short'] = Markup(dep.desc['en']['short'])
                     try:
                         dep.desc['en']['long'] = Markup(dep.desc['en']['long'])
                     except KeyError:

-- 
Static and dynamic websites for Debian Pure Blends