[Blends-commit] [SCM] website branch, master, updated. 968015120a082330357398e7e527c2984bf60976

Ole Streicher olebole at debian.org
Sun Mar 6 19:52:33 UTC 2016


The following commit has been merged in the master branch:
commit 968015120a082330357398e7e527c2984bf60976
Author: Ole Streicher <olebole at debian.org>
Date:   Sun Mar 6 20:52:30 2016 +0100

    Remove another bunch of unneeded str.encode('utf-8')

diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index 919a086..049ad3e 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -1222,8 +1222,8 @@ class TaskDependencies:
                     else:
                         (short, long) = SplitDescription(stanza['description'])
                         # Markup strings to enable verbatim output of preformatted text
-                        self.metapkg.desc['en']['short'] = MarkupString(short.encode('utf-8'), self.metapkg.PrintedName, 'taskShortDesc')
-                        self.metapkg.desc['en']['long']  = MarkupString(long.encode('utf-8'),  self.metapkg.PrintedName, 'taskLongDesc')
+                        self.metapkg.desc['en']['short'] = MarkupString(short, self.metapkg.PrintedName, 'taskShortDesc')
+                        self.metapkg.desc['en']['long']  = MarkupString(long,  self.metapkg.PrintedName, 'taskLongDesc')
                         found_description = True
                     continue
                 if key == 'Meta-Depends':
@@ -1458,8 +1458,8 @@ class TaskDependencies:
                         _pkg = self.metapkg.PrintedName
                     else:
                         _pkg = dep.pkg
-                    remark['short'] = MarkupString(short.encode('utf-8'), _pkg, 'RemarkShort')
-                    remark['long']  = MarkupString(long.encode('utf-8'),  _pkg, 'RemarkLong')
+                    remark['short'] = MarkupString(short, _pkg, 'RemarkShort')
+                    remark['long']  = MarkupString(long,  _pkg, 'RemarkLong')
                     continue
                 else:
             	    if key not in KEYSTOIGNORE:

-- 
Static and dynamic websites for Debian Pure Blends



More information about the Blends-commit mailing list