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

Ole Streicher ole at aip.de
Fri Mar 4 13:02:47 UTC 2016


The following commit has been merged in the master branch:
commit 9b7a60a761e9ecaf1c7f382512ee783977fcb7d1
Author: Ole Streicher <ole at aip.de>
Date:   Fri Mar 4 11:47:33 2016 +0100

    Remove superfluid encode('ascii','xmlcharrefreplace') calls.
    If there are UnicodeEncodeErrors, they should be fixed in tasks.py when
    the files are written.

diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index f7dcc46..67a8feb 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -1224,28 +1224,6 @@ class TaskDependencies:
         if dep.dep_strength == 'Ignore' or dep.dep_strength == 'Avoid':
             return
         if source != 1:
-
-	    # Solves UnicodeEncodeError because of characters present in the
-            # long description of the dependecies in 'unoficial','prospective' packages
-            try:
-              dep.desc['en']['long'] = dep.desc['en']['long'].encode('ascii','xmlcharrefreplace')
-            except:
-              pass
-
-            # Solves UnicodeEncodeError because of characters present in the
-            # authors name of the dependencies in 'wnpp' packages
-	    try:
-              dep.properties['published']['authors'] = dep.properties['published']['authors'].encode('ascii','xmlcharrefreplace')
-            except:
-              pass
-
-	    # Solves UnicodeEncodeError because of characters present in the title of 
-	    # dependencies in blends debian-science, debian-pan
-	    try:
-              dep.properties['published']['title'] = dep.properties['published']['title'].encode('ascii','xmlcharrefreplace')
-            except:
-              pass
-
             # In general we can just add the dependency to the list
             self.dependencies[dep.pkgstatus].append(dep)
             return

-- 
Static and dynamic websites for Debian Pure Blends



More information about the Blends-commit mailing list