The following commit has been merged in the master branch:
commit 4ca43e4e71ff0ed323cb8d48d0b85db70cd91e2f
Author: Ole Streicher <[email protected]>
Date: Tue Mar 15 12:20:36 2016 +0100
Fix error string formatting: '+' is less strong bound than '%'
diff --git a/webtools/blendsmarkdown.py b/webtools/blendsmarkdown.py
index 7d0cc3a..20481f1 100644
--- a/webtools/blendsmarkdown.py
+++ b/webtools/blendsmarkdown.py
@@ -109,14 +109,12 @@ def MarkupString(string, pkg, elem, lang='en'):
try:
string = Markup(string)
except UnicodeDecodeError as err:
- stderr.write("----> %s UnicodeDecodeError in %s (lang='%s'):" +
- " '%s'; Err: %s\n"
+ stderr.write("----> %s UnicodeDecodeError in %s (lang='%s'): '%s';
Err: %s\n"
% (elem, pkg, lang, 'debug-string', str(err)))
try:
string = Markup(unicode(string, 'utf-8'))
except TypeError as err:
- stderr.write("====> %s TypeError in %s (lang='%s'):" +
- " '%s'; Err: %s\n"
+ stderr.write("====> %s TypeError in %s (lang='%s'): '%s'; Err:
%s\n"
% (elem, pkg, lang, 'debug-string', str(err)))
except TypeError as err:
stderr.write("----> %s TypeError in %s (lang='%s'): '%s'; Err: %s\n"
--
Static and dynamic websites for Debian Pure Blends
_______________________________________________
Blends-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
