[Blends-commit] [SCM] website branch, master, updated. 339fb37d6948ce9c9e3e6cda40600739ffb7683d

[Ole Streicher]

The following commit has been merged in the master branch:
commit 339fb37d6948ce9c9e3e6cda40600739ffb7683d
Author: Ole Streicher <ole at aip.de>
Date:   Mon Mar 7 09:31:13 2016 +0100

    Revert last commit: debian-edu was fixed much quicker than expected :-)

diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index 2b8a388..8d5a5de 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -1200,15 +1200,8 @@ class TaskDependencies:
         global dep_strength_keys
 
         found_description=False
-        try:
-            f = codecs.open(self.taskfile, "r", "utf-8")
-            iter = deb822.Sources.iter_paragraphs(f)
-        except UnicodeDecodeError:
-            # debian-edu still has some tasks files in non-utf-8
-            # bug #817018
-            f = codecs.open(self.taskfile, "r", "iso-8859-1")
-            iter = deb822.Sources.iter_paragraphs(f, encoding="iso-8859-1")
-        for stanza in iter:
+        f = codecs.open(self.taskfile, "r", "utf-8")
+        for stanza in deb822.Sources.iter_paragraphs(f):
             # Why and Responsible can be valid for more than one dependency
             # Store them in strings and use them for all Dependent Package objects
             why               = None

-- 
Static and dynamic websites for Debian Pure Blends